Merge commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8'

* commit 'a939e5b2527d0c4628815b1d3d8e29ee921227e8': h264: remove a commented out nonsense line Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 097efa4750
parent aa000ddab2 a939e5b252
commit 097efa4750
1 changed files with 0 additions and 1 deletions
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@ -659,7 +659,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
        return ret;

    /* set defaults */
-    // s->decode_mb = ff_h263_decode_mb;
    if (!avctx->has_b_frames)
        h->low_delay = 1;