Merge commit 'a939e5b2'

* commit 'a939e5b2':
  h264: remove a commented out nonsense line
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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;