diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:22:19 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:22:19 +0100 |
commit | 3b5c0f5e362f2ba7077e34e47e64dedd5f705dcb (patch) | |
tree | 25e0a546fb6399104e106ff40b84554b8be98f25 | |
parent | b9d887c225466576ae80ef7f2b109e866ff137b2 (diff) | |
download | ffmpeg-3b5c0f5e362f2ba7077e34e47e64dedd5f705dcb.tar.gz |
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 <michaelni@gmx.at>
-rw-r--r-- | libavcodec/h264.c | 14 |
1 files changed, 0 insertions, 14 deletions
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); |