[FFmpeg-cvslog] h264: remove low_delay/has_b_frame setting code from nal loop

Michael Niedermayer git at videolan.org
Fri Dec 14 15:26:52 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 14 15:22:19 2012 +0100| [3b5c0f5e362f2ba7077e34e47e64dedd5f705dcb] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b5c0f5e362f2ba7077e34e47e64dedd5f705dcb
---

 libavcodec/h264.c |   14 --------------
 1 file changed, 14 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 75ffd00..85e10af 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);



More information about the ffmpeg-cvslog mailing list