[FFmpeg-cvslog] r23949 - trunk/libavcodec/mpegaudiodec.c

mru subversion
Fri Jul 2 01:21:17 CEST 2010


Author: mru
Date: Fri Jul  2 01:21:17 2010
New Revision: 23949

Log:
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.

Modified:
   trunk/libavcodec/mpegaudiodec.c

Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c	Fri Jul  2 01:18:27 2010	(r23948)
+++ trunk/libavcodec/mpegaudiodec.c	Fri Jul  2 01:21:17 2010	(r23949)
@@ -322,7 +322,7 @@ static av_cold int decode_init(AVCodecCo
 
     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);



More information about the ffmpeg-cvslog mailing list