diff options
author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 17:06:43 -0700 |
---|---|---|
committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 17:06:55 -0700 |
commit | e4af9be0f45c8f2ca148fb971f1e0c6782530e8c (patch) | |
tree | ec957ba4fb48112765835398f34b96d23b815a1a /libavcodec/h264dec.c | |
parent | 796027f22154c799e0063e2457b31e0cfd1dddae (diff) |
Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'"
This reverts commit 796027f22154c799e0063e2457b31e0cfd1dddae, reversing
changes made to bca30ed2b67f095fd31e07319a622ac30ad22978.
Preemptive revert before further testing has been done.
Diffstat (limited to 'libavcodec/h264dec.c')
-rw-r--r-- | libavcodec/h264dec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 977977431e..323639dc19 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -783,6 +783,12 @@ again: ret = -1; goto end; } + if (nal->type != H264_NAL_IDR_SLICE) { + av_log(h->avctx, AV_LOG_ERROR, + "Invalid mix of idr and non-idr slices\n"); + ret = -1; + goto end; + } 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"); |