RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmdutils: avoid setting data pointers to invalid values in alloc_buffer() 

Fixes bug 352.
This commit is contained in:
Anton Khirnov 2012-09-11 11:03:52 +02:00
parent cb6632809d
commit 990450c5bf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdutils.c
View File

@ -1316,7 +1316,7 @@ static int alloc_buffer(FrameBuffer **pool, AVCodecContext *s, FrameBuffer **pbu
const int v_shift = i==0 ? 0 : v_chroma_shift; const int v_shift = i==0 ? 0 : v_chroma_shift;
if (s->flags & CODEC_FLAG_EMU_EDGE) if (s->flags & CODEC_FLAG_EMU_EDGE)
buf->data[i] = buf->base[i]; buf->data[i] = buf->base[i];
else else if (buf->base[i])
buf->data[i] = buf->base[i] + buf->data[i] = buf->base[i] +
FFALIGN((buf->linesize[i]*edge >> v_shift) + FFALIGN((buf->linesize[i]*edge >> v_shift) +
(pixel_size*edge >> h_shift), 32); (pixel_size*edge >> h_shift), 32);