ffmpeg | branch: master | Luca Barbato <lu_z...@gentoo.org> | Mon May 25 22:30:10 2015 +0200| [0181ae9af2de1526464d23209b82e6674d362f5d] | committer: Luca Barbato
h264: Make sure reinit failures mark the context as not initialized Bug-Id: CVE-2015-3417 CC: libav-sta...@libav.org > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0181ae9af2de1526464d23209b82e6674d362f5d --- libavcodec/h264_slice.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1cee634..a63f45a 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1171,6 +1171,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } if (h->context_initialized && needs_reinit) { + h->context_initialized = 0; if (sl != h->slice_ctx) { av_log(h->avctx, AV_LOG_ERROR, "changing width %d -> %d / height %d -> %d on " _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
