From 098eed95bc1a6b2c8ac97f126f62bb74699670cf Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 9 Dec 2012 18:44:44 +0100 Subject: [PATCH] mdec: merge mdec_common_init() into decode_init(). There is no point in keeping those two functions separate. --- libavcodec/mdec.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 2f74cdcd01..ec09124ffc 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -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); -- 2.11.4.GIT