diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 15:59:51 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 15:59:51 -0700 |
| commit | 796027f22154c799e0063e2457b31e0cfd1dddae (patch) | |
| tree | 3f4bfbc1d84c8f3bab88a128ca57dc5adf822e7c /libavcodec/h264dec.c | |
| parent | bca30ed2b67f095fd31e07319a622ac30ad22978 (diff) | |
| parent | d1d7678040cd60148f97b372cb4291bcc45b2e22 (diff) | |
Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'
* commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22':
h264: fix the check for mixed IDR/non-IDR slices
Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
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"); |