[SCM] libav/experimental: last_picture should be never == NULL (it was with dr1) this might fix a segfault with error concealment
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:32:59 UTC 2013
The following commit has been merged in the experimental branch:
commit b7adc711fa663f8714a3d096f763cf5129c99505
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Aug 4 16:05:05 2002 +0000
last_picture should be never == NULL (it was with dr1) this might fix a segfault with error concealment
Originally committed as revision 837 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 051c8d9..654b0e0 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -657,6 +657,9 @@ void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
s->next_picture[i] = tmp;
s->current_picture[i] = tmp;
+ if(s->last_picture[i]==NULL)
+ s->last_picture[i]= s->next_picture[i];
+
s->last_dr_opaque= s->next_dr_opaque;
s->next_dr_opaque= avctx->dr_opaque_frame;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list