diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-06 01:37:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-06 01:41:00 +0200 |
| commit | 99a567cbe24aba1efe65d3cfc44b7dbdebe2aab1 (patch) | |
| tree | 0ead9b56243a2eb18d64a59e86150e81594f1a9f /libavcodec | |
| parent | 43482bd1a55c093570d035a01b7d284a65e611ef (diff) | |
| parent | 249796e2560c2cce1add722c3e873de96b17be74 (diff) | |
| download | ffmpeg-99a567cbe24aba1efe65d3cfc44b7dbdebe2aab1.tar.gz | |
Merge commit '249796e2560c2cce1add722c3e873de96b17be74'
* commit '249796e2560c2cce1add722c3e873de96b17be74':
svq3: initialize some required H264Context fields.
See: e6c710600e1d474b53e52398969140f79052bfde
See: aa000ddab2352b82b9ef7ec0974080065b7cc409
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/svq3.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a3c9cf593e..05fc9b723b 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -895,12 +895,16 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx) ff_h264dsp_init(&h->h264dsp, 8, 1); av_assert0(h->sps.bit_depth_chroma == 0); - ff_h264_pred_init(&h->hpc, h->avctx->codec_id, 8, 1); + ff_h264_pred_init(&h->hpc, AV_CODEC_ID_SVQ3, 8, 1); ff_videodsp_init(&h->vdsp, 8); - h->sps.bit_depth_luma = avctx->bits_per_raw_sample = 8; + memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t)); memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t)); + avctx->bits_per_raw_sample = 8; + h->sps.bit_depth_luma = 8; + h->chroma_format_idc = 1; + ff_hpeldsp_init(&s->hdsp, avctx->flags); ff_tpeldsp_init(&s->tdsp); |