Merge commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690'

* commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690':
  h264: drop redundant initialization in init()

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/h264.c
index 933c58234157174995cb46a19577139ac6200243,311f5bb0fedb50e09fa9cbedff4b7c5bc7a2e616..ba2fc407928e8bf1095d3be7bed9c115456a8ebb
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -616,20 -592,7 +616,8 @@@ av_cold int ff_h264_decode_init(AVCodec
  
      h->avctx = avctx;
  
-     h->bit_depth_luma    = 8;
-     h->chroma_format_idc = 1;
- 
-     ff_h264dsp_init(&h->h264dsp, 8, 1);
-     av_assert0(h->sps.bit_depth_chroma == 0);
-     ff_h264chroma_init(&h->h264chroma, h->sps.bit_depth_chroma);
-     ff_h264qpel_init(&h->h264qpel, 8);
-     ff_h264_pred_init(&h->hpc, h->avctx->codec_id, 8, 1);
- 
      h->dequant_coeff_pps = -1;
- 
-     /* needed so that IDCT permutation is known early */
-     ff_videodsp_init(&h->vdsp, 8);
 +    h->current_sps_id = -1;
      h->cur_chroma_format_idc = -1;
  
      memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t));