ffmpeg | branch: release/2.6 | Luca Barbato <lu_z...@gentoo.org> | Mon May 25 22:30:10 2015 +0200| [b46ae71f29a1ebffd4040594214b3e3d69d96830] | committer: Michael Niedermayer
h264: Make sure reinit failures mark the context as not initialized (cherry picked from commit 0181ae9af2de1526464d23209b82e6674d362f5d) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b46ae71f29a1ebffd4040594214b3e3d69d96830 --- libavcodec/h264_slice.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index d8b7bc7..b3fdc99 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1454,6 +1454,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0) if (h->context_initialized && (must_reinit || needs_reinit)) { + h->context_initialized = 0; if (h != h0) { 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
