h264: Make sure reinit failures mark the context as not initialized

Bug-Id: CVE-2015-3417
CC: libav-stable@libav.org

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index e47a4484e6abc661c7e74d5e3773ed476ccea705..c2c3e9ff1e7cf7cdd27203a12c83fba1f3d0e7c4 100644 (file)
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1319,6 +1319,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
     }
 
     if (h->context_initialized && needs_reinit) {
+        h->context_initialized = 0;
         if (h != h0) {
             av_log(h->avctx, AV_LOG_ERROR,
                    "changing width %d -> %d / height %d -> %d on "