mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 16:10:09 +02:00
10l: scratchpad could be allocated before its size was known.
Originally committed as revision 3812 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
9f2d1b4ff5
commit
934b0821db
@ -2540,8 +2540,6 @@ static int alloc_tables(H264Context *h){
|
||||
}
|
||||
}
|
||||
|
||||
CHECKED_ALLOCZ(s->obmc_scratchpad, 16*s->linesize + 2*8*s->uvlinesize);
|
||||
|
||||
return 0;
|
||||
fail:
|
||||
free_tables(h);
|
||||
@ -2613,6 +2611,11 @@ static void frame_start(H264Context *h){
|
||||
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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user