[FFmpeg-cvslog] libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE
Michael Niedermayer
git at videolan.org
Sun Jul 7 01:54:30 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 7 01:29:48 2013 +0200| [707b2135fda3687a6eeb91411f801e437f633f30] | committer: Michael Niedermayer
libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE
should fix ticket2755
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=707b2135fda3687a6eeb91411f801e437f633f30
---
libavcodec/x86/mpegvideo.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c
index f8cabe5..3110fd9 100644
--- a/libavcodec/x86/mpegvideo.c
+++ b/libavcodec/x86/mpegvideo.c
@@ -26,7 +26,7 @@
#include "libavcodec/mpegvideo.h"
#include "dsputil_x86.h"
-#if HAVE_INLINE_ASM
+#if HAVE_MMX_INLINE
static void dct_unquantize_h263_intra_mmx(MpegEncContext *s,
int16_t *block, int n, int qscale)
@@ -552,11 +552,11 @@ static void denoise_dct_sse2(MpegEncContext *s, int16_t *block){
);
}
-#endif /* HAVE_INLINE_ASM */
+#endif /* HAVE_MMX_INLINE */
av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
{
-#if HAVE_INLINE_ASM
+#if HAVE_MMX_INLINE
int mm_flags = av_get_cpu_flags();
if (mm_flags & AV_CPU_FLAG_MMX) {
@@ -574,5 +574,5 @@ av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
s->denoise_dct= denoise_dct_mmx;
}
}
-#endif /* HAVE_INLINE_ASM */
+#endif /* HAVE_MMX_INLINE */
}
More information about the ffmpeg-cvslog
mailing list