Merge commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a'
authorClément Bœsch <clement@stupeflix.com>
Mon, 20 Jun 2016 10:07:05 +0000 (12:07 +0200)
committerClément Bœsch <clement@stupeflix.com>
Mon, 20 Jun 2016 10:07:10 +0000 (12:07 +0200)
* commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a':
  h264: remove unused H264SliceContext.rbsp_buffer

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/h264.c
libavcodec/h264.h

index bd9f67292a4dae1c19cfbf2c3bd9ba7d96910a8a,9cc0a241fef3ed31e5e00e1d65c21f72aa9cd6b1..812e7c00279fe15a664f734b257f57ab7f99207e
@@@ -1097,20 -946,11 +1095,18 @@@ FF_ENABLE_DEPRECATION_WARNING
              context_count = 0;
          }
  
 -        if (err < 0) {
 -            av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
 +        if (err < 0 || err == SLICE_SKIPED) {
 +            if (err < 0)
 +                av_log(h->avctx, AV_LOG_ERROR, "decode_slice_header error\n");
              sl->ref_count[0] = sl->ref_count[1] = sl->list_count = 0;
 -        } else if (err == 1) {
 +        } else if (err == SLICE_SINGLETHREAD) {
 +            if (context_count > 0) {
 +                ret = ff_h264_execute_decode_slices(h, context_count);
 +                if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
 +                    goto end;
 +                context_count = 0;
 +            }
-             /* Slice could not be decoded in parallel mode, restart. Note
-              * that rbsp_buffer is not transferred, but since we no longer
-              * run in parallel mode this should not be an issue. */
+             /* Slice could not be decoded in parallel mode, restart. */
              sl               = &h->slice_ctx[0];
              goto again;
          }
Simple merge