diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 17:45:36 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 17:45:52 -0700 |
| commit | 826c780c1209a8bd7e98ad2c532cbee86401e746 (patch) | |
| tree | 3f4bfbc1d84c8f3bab88a128ca57dc5adf822e7c /libavcodec/h264dec.c | |
| parent | e4af9be0f45c8f2ca148fb971f1e0c6782530e8c (diff) | |
Revert "Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'""
This reverts commit e4af9be0f45c8f2ca148fb971f1e0c6782530e8c and redoes
796027f22154c799e0063e2457b31e0cfd1dddae.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264dec.c')
| -rw-r--r-- | libavcodec/h264dec.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 323639dc19..977977431e 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -783,12 +783,6 @@ 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"); |