From 3b5c0f5e362f2ba7077e34e47e64dedd5f705dcb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 14 Dec 2012 15:22:19 +0100 Subject: h264: remove low_delay/has_b_frame setting code from nal loop This code is now executed in h264_set_parameter_from_sps() Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 75ffd00b4b..85e10afac8 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4057,20 +4057,6 @@ again: ff_h264_decode_seq_parameter_set(h); } - - if (s->flags & CODEC_FLAG_LOW_DELAY || - (h->sps.bitstream_restriction_flag && - !h->sps.num_reorder_frames)) { - if (s->avctx->has_b_frames > 1 || h->delayed_pic[0]) - av_log(avctx, AV_LOG_WARNING, "Delayed frames seen " - "reenabling low delay requires a codec " - "flush.\n"); - else - s->low_delay = 1; - } - - if (avctx->has_b_frames < 2) - avctx->has_b_frames = !s->low_delay; break; case NAL_PPS: init_get_bits(&s->gb, ptr, bit_length); -- cgit v1.2.3