diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 20:55:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 21:02:13 +0200 |
| commit | 68f48406069e9aff0c01c96671f7c58de166e1f8 (patch) | |
| tree | 48d735453163e9ae36c707eae3a0d989b78844d5 /libavcodec/h264.c | |
| parent | cde98920da78801a40f9120cfef650ac05a22224 (diff) | |
| parent | 050324d020f843ce333276ebb6f27cc6026f37d0 (diff) | |
| download | ffmpeg-68f48406069e9aff0c01c96671f7c58de166e1f8.tar.gz | |
Merge commit '050324d020f843ce333276ebb6f27cc6026f37d0'
* commit '050324d020f843ce333276ebb6f27cc6026f37d0':
h264: initialize cur_chroma_format_idc
See: a51fbb56bb9352476affaef1fc6773c8b059db91 / 137df692fc28710aa1a21856b1f5b9e157896fef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 283e753a60..933c582341 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -619,8 +619,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) 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); @@ -632,6 +630,7 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) /* needed so that IDCT permutation is known early */ ff_videodsp_init(&h->vdsp, 8); + h->cur_chroma_format_idc = -1; memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t)); memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t)); |