RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Michael Niedermayer 2010-07-07 10:36:26 +00:00
parent c7310b7b2b
commit 69b56ed7a6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpegaudiodec.c
View File

@ -323,6 +323,9 @@ static av_cold int decode_init(AVCodecContext * avctx)
s->apply_window_mp3 = apply_window_mp3_c;
#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);
@ -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 */