Browse Source

h254: explicitly initialize bit depth/chroma idc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n0.9
Laurent Aimar Michael Niedermayer 14 years ago
parent
commit
a51fbb56bb
1 changed files with 8 additions and 2 deletions
  1. +8
    -2
      libavcodec/h264.c

+ 8
- 2
libavcodec/h264.c View File

@@ -992,13 +992,19 @@ static av_cold void common_init(H264Context *h){
s->height = s->avctx->height;
s->codec_id= s->avctx->codec->id;

ff_h264dsp_init(&h->h264dsp, 8, 1);
ff_h264_pred_init(&h->hpc, s->codec_id, 8, 1);
s->avctx->bits_per_raw_sample = 8;
h->cur_chroma_format_idc = 1;

ff_h264dsp_init(&h->h264dsp,
s->avctx->bits_per_raw_sample, h->cur_chroma_format_idc);
ff_h264_pred_init(&h->hpc, s->codec_id,
s->avctx->bits_per_raw_sample, h->cur_chroma_format_idc);

h->dequant_coeff_pps= -1;
s->unrestricted_mv=1;
s->decode=1; //FIXME

s->dsp.dct_bits = 16;
dsputil_init(&s->dsp, s->avctx); // needed so that idct permutation is known early

memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t));


Loading…
Cancel
Save