diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 19:28:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-11 22:01:46 +0200 |
| commit | f1b4a71ddfcdfa37106243383255406e7be51b93 (patch) | |
| tree | e20e7217badf391c8f8ac6545a7deb1bdd2ea7e8 | |
| parent | fa538f1a8c33eed6dca8a67656ace6398a0ce323 (diff) | |
| download | ffmpeg-f1b4a71ddfcdfa37106243383255406e7be51b93.tar.gz | |
avcodec/h264: Fail for invalid mixed IDR / non IDR frames in slice threading mode
Fixes Ticket4408
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc58d5c43b4c7396fc69081eb0dfe5b6a21cb10d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8ec46dfb1c..e64cc0780a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1537,8 +1537,14 @@ again: ret = -1; goto end; } - if(!idr_cleared) + if(!idr_cleared) { + if (h->current_slice && (avctx->active_thread_type & FF_THREAD_SLICE)) { + av_log(h, AV_LOG_ERROR, "invalid mixed IDR / non IDR frames cannot be decoded in slice multithreading mode\n"); + ret = AVERROR_INVALIDDATA; + goto end; + } idr(h); // FIXME ensure we don't lose some frames if there is reordering + } idr_cleared = 1; h->has_recovery_point = 1; case NAL_SLICE: |