Module: libav Branch: release/0.8 Commit: 141d4ed6c0911fde1913f3b757ace5012eabd897
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Tue Sep 11 11:03:52 2012 +0200 cmdutils: avoid setting data pointers to invalid values in alloc_buffer() Fixes bug 352. (cherry picked from commit 990450c5bf17afc31a81d6225afaac86d0dca5dd) Conflicts: cmdutils.c Signed-off-by: Anton Khirnov <[email protected]> --- avconv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/avconv.c b/avconv.c index 90bc49c..34507d4 100644 --- a/avconv.c +++ b/avconv.c @@ -455,7 +455,7 @@ static int alloc_buffer(InputStream *ist, FrameBuffer **pbuf) 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); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
