Merge commit '0652e024c680420d298cdf3719d0a0c030173fe3'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 21:47:49 +0000 (22:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 21:51:59 +0000 (22:51 +0100)
* commit '0652e024c680420d298cdf3719d0a0c030173fe3':
  h264: reset ref count if decoding the slice header fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c

index 5699051..cde7af9 100644 (file)
@@ -5056,9 +5056,10 @@ again:
                 context_count = 0;
             }
 
-            if (err < 0)
+            if (err < 0) {
                 av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
-            else if (err == 1) {
+                h->ref_count[0] = h->ref_count[1] = h->list_count = 0;
+            } else if (err == 1) {
                 /* Slice could not be decoded in parallel mode, copy down
                  * NAL unit stuff to context 0 and restart. Note that
                  * rbsp_buffer is not transferred, but since we no longer