Mercurial > libavcodec.hg

comparison mpegaudiodec.c @ 12102:06c7d6e5eeb6 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move ff_dct_init(context) out of if(one time init) fixes calling a null pointer in issue658
author michael
date Wed, 07 Jul 2010 10:36:26 +0000
parents 49c528a39187
children f31ba4ca1397
comparison
equal deleted inserted replaced
12101:ab330d7112ad 12102:06c7d6e5eeb6
322 s->avctx = avctx; 322 s->avctx = avctx;
323 s->apply_window_mp3 = apply_window_mp3_c; 323 s->apply_window_mp3 = apply_window_mp3_c;
324 #if HAVE_MMX && CONFIG_FLOAT 324 #if HAVE_MMX && CONFIG_FLOAT
325 ff_mpegaudiodec_init_mmx(s); 325 ff_mpegaudiodec_init_mmx(s);
326 #endif 326 #endif
327 #if CONFIG_FLOAT
328 ff_dct_init(&s->dct, 5, DCT_II);
329 #endif
327 if (HAVE_ALTIVEC && CONFIG_FLOAT) ff_mpegaudiodec_init_altivec(s); 330 if (HAVE_ALTIVEC && CONFIG_FLOAT) ff_mpegaudiodec_init_altivec(s);
328 331
329 avctx->sample_fmt= OUT_FMT; 332 avctx->sample_fmt= OUT_FMT;
330 s->error_recognition= avctx->error_recognition; 333 s->error_recognition= avctx->error_recognition;
331 334
354 scale_factor_mult[i][0], 357 scale_factor_mult[i][0],
355 scale_factor_mult[i][1], 358 scale_factor_mult[i][1],
356 scale_factor_mult[i][2]); 359 scale_factor_mult[i][2]);
357 } 360 }
358 361
359 #if CONFIG_FLOAT
360 ff_dct_init(&s->dct, 5, DCT_II);
361 #endif
362 RENAME(ff_mpa_synth_init)(RENAME(ff_mpa_synth_window)); 362 RENAME(ff_mpa_synth_init)(RENAME(ff_mpa_synth_window));
363 363
364 /* huffman decode tables */ 364 /* huffman decode tables */
365 offset = 0; 365 offset = 0;
366 for(i=1;i<16;i++) { 366 for(i=1;i<16;i++) {