Merge commit '050324d020f843ce333276ebb6f27cc6026f37d0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 18:55:42 +0000 (20:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 19:02:13 +0000 (21:02 +0200)
* commit '050324d020f843ce333276ebb6f27cc6026f37d0':
  h264: initialize cur_chroma_format_idc

See: a51fbb56bb9352476affaef1fc6773c8b059db91 / 137df692fc28710aa1a21856b1f5b9e157896fef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264.c

@@@ -619,10 -595,7 +619,8 @@@ av_cold int ff_h264_decode_init(AVCodec
      h->bit_depth_luma    = 8;
      h->chroma_format_idc = 1;
  
-     h->cur_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);