Merge commit '65afa65e'

* commit '65afa65e':
  h264: drop redundant initialization of the scaling matrices
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/h264.c

@@ -658,9 +658,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
     if (ret < 0)
         return ret;
 
-    memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t));
-    memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
-
     /* set defaults */
     // s->decode_mb = ff_h263_decode_mb;
     if (!avctx->has_b_frames)