virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

mdec: merge mdec_common_init() into decode_init().

Browse Source 
There is no point in keeping those two functions separate.
This commit is contained in:
Anton Khirnov 2012-12-09 18:44:44 +01:00
parent f1c395944c
commit 098eed95bc
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mdec.c
View File

@ -211,23 +211,17 @@ static int decode_frame(AVCodecContext *avctx,
return (get_bits_count(&a->gb)+31)/32*4; 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; MDECContext * const a = avctx->priv_data;
AVFrame *p= &a->picture;
ff_dsputil_init(&a->dsp, avctx);
a->mb_width = (avctx->coded_width + 15) / 16; a->mb_width = (avctx->coded_width + 15) / 16;
a->mb_height = (avctx->coded_height + 15) / 16; a->mb_height = (avctx->coded_height + 15) / 16;
avctx->coded_frame= &a->picture; avctx->coded_frame= &a->picture;
a->avctx= avctx; a->avctx= avctx;
}
static av_cold int decode_init(AVCodecContext *avctx){ ff_dsputil_init(&a->dsp, avctx);
MDECContext * const a = avctx->priv_data;
AVFrame *p= &a->picture;
mdec_common_init(avctx);
ff_mpeg12_init_vlcs(); ff_mpeg12_init_vlcs();
ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct); ff_init_scantable(a->dsp.idct_permutation, &a->scantable, ff_zigzag_direct);