From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 7 Jul 2010 10:36:26 +0000 (+0000)
Subject: Move ff_dct_init(context) out of if(one time init)
X-Git-Tag: v0.7b2~3625
X-Git-Url: https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=69b56ed7a6215a077bc557d0e98f709d2959f473;hp=c7310b7b2bb65bd31786840ecd0fab459bd3a6bd

Move ff_dct_init(context) out of if(one time init)
fixes calling a null pointer in issue658

Originally committed as revision 24081 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index f3ed155ab9..4f48c15e09 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -324,6 +324,9 @@ static av_cold int decode_init(AVCodecContext * avctx)
 #if HAVE_MMX && CONFIG_FLOAT
     ff_mpegaudiodec_init_mmx(s);
 #endif
+#if CONFIG_FLOAT
+    ff_dct_init(&s->dct, 5, DCT_II);
+#endif
     if (HAVE_ALTIVEC && CONFIG_FLOAT) ff_mpegaudiodec_init_altivec(s);
 
     avctx->sample_fmt= OUT_FMT;
@@ -356,9 +359,6 @@ static av_cold int decode_init(AVCodecContext * avctx)
                     scale_factor_mult[i][2]);
         }
 
-#if CONFIG_FLOAT
-        ff_dct_init(&s->dct, 5, DCT_II);
-#endif
         RENAME(ff_mpa_synth_init)(RENAME(ff_mpa_synth_window));
 
         /* huffman decode tables */