summaryrefslogtreecommitdiff
path: root/libavcodec/h264dec.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-05-20 11:04:55 +0200
committerAnton Khirnov <anton@khirnov.net>2016-06-21 11:19:19 +0200
commitd1d7678040cd60148f97b372cb4291bcc45b2e22 (patch)
treea8fc5ba7d7e611e0f3baf29642a484d9f4d8bd46 /libavcodec/h264dec.c
parentb13fc1e344011949929975a3451f78f226aa1de3 (diff)
h264: fix the check for mixed IDR/non-IDR slices
Diffstat (limited to 'libavcodec/h264dec.c')
-rw-r--r--libavcodec/h264dec.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index cc5bdca43c..c99f6e6ec7 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -694,12 +694,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size)
err = 0;
switch (nal->type) {
case H264_NAL_IDR_SLICE:
- 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;
- }
idr(h); // FIXME ensure we don't lose some frames if there is reordering
case H264_NAL_SLICE:
sl->gb = nal->gb;