ffmpeg | branch: release/2.8 | Michael Niedermayer <mich...@niedermayer.cc> |
Tue Jun 7 22:17:38 2016 +0200| [bfca58ee2f4c238f1730a9b5d598568cc956b742] |
committer: Michael Niedermayer
avcodec/h264: Fix off by 1 context count
Fixes fate-h264-xavc-4389 with slice threads
(cherry picked from commit 27c1eae55f24e9ed005a6634cd4ddd867118fa48)
Conflicts:
libavcodec/h264.c
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfca58ee2f4c238f1730a9b5d598568cc956b742
---
libavcodec/h264.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 1c7b8a1..0d42c48 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1652,12 +1652,10 @@ again:
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 == SLICE_SINGLETHREAD) {
- if (context_count > 1) {
- ret = ff_h264_execute_decode_slices(h, context_count - 1);
- if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE))
- goto end;
- 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. */
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
