From 990450c5bf17afc31a81d6225afaac86d0dca5dd Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 11 Sep 2012 11:03:52 +0200 Subject: cmdutils: avoid setting data pointers to invalid values in alloc_buffer() Fixes bug 352. --- cmdutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmdutils.c') diff --git a/cmdutils.c b/cmdutils.c index 6fb991884f..0d216db469 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -1316,7 +1316,7 @@ static int alloc_buffer(FrameBuffer **pool, AVCodecContext *s, FrameBuffer **pbu const int v_shift = i==0 ? 0 : v_chroma_shift; if (s->flags & CODEC_FLAG_EMU_EDGE) buf->data[i] = buf->base[i]; - else + else if (buf->base[i]) buf->data[i] = buf->base[i] + FFALIGN((buf->linesize[i]*edge >> v_shift) + (pixel_size*edge >> h_shift), 32); -- cgit v1.2.3