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/h264_slice.c | |
| parent | 796027f22154c799e0063e2457b31e0cfd1dddae (diff) | |
| download | ffmpeg-e4af9be0f45c8f2ca148fb971f1e0c6782530e8c.tar.gz | |
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/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index ade41f5d35..f32a74aea0 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1497,8 +1497,6 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl, h->nb_mmco = sl->nb_mmco; h->explicit_ref_marking = sl->explicit_ref_marking; - h->picture_idr = nal->type == H264_NAL_IDR_SLICE; - /* Set the frame properties/side data. Only done for the second field in * field coded frames, since some SEI information is present for each field * and is merged by the SEI parsing code. */ @@ -1831,11 +1829,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, } } - if (h->picture_idr && nal->type != H264_NAL_IDR_SLICE) { - av_log(h->avctx, AV_LOG_ERROR, "Invalid mix of IDR and non-IDR slices\n"); - return AVERROR_INVALIDDATA; - } - av_assert1(h->mb_num == h->mb_width * h->mb_height); if (sl->first_mb_addr << FIELD_OR_MBAFF_PICTURE(h) >= h->mb_num || sl->first_mb_addr >= h->mb_num) { |