Browse Source

mdec: merge mdec_common_init() into decode_init().

There is no point in keeping those two functions separate.
tags/n1.2
Anton Khirnov 13 years ago
parent
commit
098eed95bc
1 changed files with 3 additions and 9 deletions
  1. +3
    -9
      libavcodec/mdec.c

+ 3
- 9
libavcodec/mdec.c View File

@@ -211,23 +211,17 @@ static int decode_frame(AVCodecContext *avctx,
return (get_bits_count(&a->gb)+31)/32*4;
}

static av_cold void mdec_common_init(AVCodecContext *avctx){
static av_cold int decode_init(AVCodecContext *avctx){
MDECContext * const a = avctx->priv_data;

ff_dsputil_init(&a->dsp, avctx);
AVFrame *p= &a->picture;

a->mb_width = (avctx->coded_width + 15) / 16;
a->mb_height = (avctx->coded_height + 15) / 16;

avctx->coded_frame= &a->picture;
a->avctx= avctx;
}

static av_cold int decode_init(AVCodecContext *avctx){
MDECContext * const a = avctx->priv_data;
AVFrame *p= &a->picture;

mdec_common_init(avctx);
ff_dsputil_init(&a->dsp, avctx);
ff_mpeg12_init_vlcs();
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct);



Loading…
Cancel
Save