RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '249796e2560c2cce1add722c3e873de96b17be74' 

* commit '249796e2560c2cce1add722c3e873de96b17be74':
  svq3: initialize some required H264Context fields.

See: e6c710600e
See: aa000ddab2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-06 01:37:34 +02:00
parent 43482bd1a5 249796e256
commit 99a567cbe2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/svq3.c
View File

@ -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);