Mercurial > libavcodec.hg

changeset 2416:06b7d678b582 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l: scratchpad could be allocated before its size was known.
author lorenm
date Sat, 08 Jan 2005 08:56:18 +0000
parents db2cf6005d19
children 991f39305057
files h264.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Fri Jan 07 05:56:07 2005 +0000
+++ b/h264.c	Sat Jan 08 08:56:18 2005 +0000
@@ -2540,8 +2540,6 @@
         }
     }
 
-    CHECKED_ALLOCZ(s->obmc_scratchpad, 16*s->linesize + 2*8*s->uvlinesize);
-    
     return 0;
 fail:
     free_tables(h);
@@ -2613,6 +2611,11 @@
         h->block_offset[20+i]= 4*((scan8[i] - scan8[0])&7) + 4*s->uvlinesize*((scan8[i] - scan8[0])>>3);
     }
 
+    /* can't be in alloc_tables because linesize isn't known there.
+     * FIXME: redo bipred weight to not require extra buffer? */
+    if(!s->obmc_scratchpad)
+        s->obmc_scratchpad = av_malloc(16*s->linesize + 2*8*s->uvlinesize);
+
 //    s->decode= (s->flags&CODEC_FLAG_PSNR) || !s->encoding || s->current_picture.reference /*|| h->contains_intra*/ || 1;
 }