diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-07 22:17:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-13 13:08:57 +0200 |
| commit | e7a064efa6ac4076eb475be4a2c487fe50e31f48 (patch) | |
| tree | 830d57c9e64607ec051969d1adcba15e86a32986 | |
| parent | a004e2e4f138b775d3352c6857f8121818cba917 (diff) | |
| download | android_external_ffmpeg-e7a064efa6ac4076eb475be4a2c487fe50e31f48.tar.gz android_external_ffmpeg-e7a064efa6ac4076eb475be4a2c487fe50e31f48.tar.bz2 android_external_ffmpeg-e7a064efa6ac4076eb475be4a2c487fe50e31f48.zip | |
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 <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 88768af733..b1001f8516 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1656,12 +1656,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. */ |