Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2903cf9a6ddad605e476b0521453ed841355fe15..85787f40d15dd1145c4323981d18d29ac85db64e 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2956,7 +2956,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
     if(must_reinit && (h != h0 || (s->avctx->active_thread_type & FF_THREAD_FRAME))) {
         av_log_missing_feature(s->avctx,
                                 "Width/height/bit depth/chroma idc changing with threads is", 0);
-        return -1;   // width / height changed during parallelized decoding
+        return AVERROR_PATCHWELCOME;   // width / height changed during parallelized decoding
     }
 
     s->mb_width  = h->sps.mb_width;
@@ -2975,6 +2975,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
         flush_dpb(s->avctx);
         ff_MPV_common_end(s);
         h->list_count = 0;
+        h->current_slice = 0;
     }
     if (!s->context_initialized) {
         if (h != h0) {