diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-07-01 23:21:17 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-07-01 23:21:17 +0000 |
| commit | 35d597d556af54ead069fe63ef6d8fa403af4340 (patch) | |
| tree | 60a56e1bd016329622bb1193c92a893c74711468 /libavcodec/mpegaudiodec.c | |
| parent | 525fcb2798bf61d7850a56e9d92412a798c66b9a (diff) | |
| download | ffmpeg-35d597d556af54ead069fe63ef6d8fa403af4340.tar.gz | |
mpegaudio: call ff_mpegaudiodec_init_mmx() only from float decoder
The mmx code is floating-point only, and this function does not know
from which decoder it is called. Without this change, the integer
decoder only "works" because the size of the context struct is smaller
in this case, and the mmx init function writes the function pointer
outside the allocated context.
Fixes issue 2054.
Originally committed as revision 23949 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 00ed7fc3f5..e5a1acecb0 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -322,7 +322,7 @@ static av_cold int decode_init(AVCodecContext * avctx) s->avctx = avctx; s->apply_window_mp3 = apply_window_mp3_c; -#if HAVE_MMX +#if HAVE_MMX && CONFIG_FLOAT ff_mpegaudiodec_init_mmx(s); #endif if (HAVE_ALTIVEC && CONFIG_FLOAT) ff_mpegaudiodec_init_altivec(s); |