diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-08 12:32:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-13 15:05:44 +0200 |
| commit | 66bd740e0ba5d43d58d12f79addaf9acf8e3c0ae (patch) | |
| tree | 1430162ba2edf17d0b7d91701209fdd7430ff905 | |
| parent | 534dc63089d99eb9996f211f70719a060acdda66 (diff) | |
| download | android_external_ffmpeg-66bd740e0ba5d43d58d12f79addaf9acf8e3c0ae.tar.gz android_external_ffmpeg-66bd740e0ba5d43d58d12f79addaf9acf8e3c0ae.tar.bz2 android_external_ffmpeg-66bd740e0ba5d43d58d12f79addaf9acf8e3c0ae.zip | |
avcodec/h264: Put context_count check back
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f883f0b0bd0dac76b58e49f5c75cf9b497eecaa0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b1001f8516..b979b15382 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1656,10 +1656,12 @@ 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) { - ret = ff_h264_execute_decode_slices(h, context_count); - if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) - goto end; - context_count = 0; + 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. */ |