[FFmpeg-cvslog] mdec: merge mdec_common_init() into decode_init().

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Dec  9 18:44:44 2012 +0100| [098eed95bc1a6b2c8ac97f126f62bb74699670cf] | committer: Anton Khirnov

mdec: merge mdec_common_init() into decode_init().

There is no point in keeping those two functions separate.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=098eed95bc1a6b2c8ac97f126f62bb74699670cf
---

 libavcodec/mdec.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index 2f74cdc..ec09124 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);