diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-07 01:29:48 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-07-07 18:24:18 +0200 |
| commit | 5ce57e0248ec5b768568d9cc2aaf4d73a90b4d33 (patch) | |
| tree | 2dd651474e5a61be7212f9623c10c6bec7845d4f | |
| parent | 5effd65312dd738fb590f1ce45be30a50aaabc72 (diff) | |
| download | ffmpeg-5ce57e0248ec5b768568d9cc2aaf4d73a90b4d33.tar.gz | |
libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE
should fix ticket2755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 707b2135fda3687a6eeb91411f801e437f633f30)
| -rw-r--r-- | libavcodec/x86/mpegvideo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/mpegvideo.c b/libavcodec/x86/mpegvideo.c index 903ad62dd5..8007fb5e77 100644 --- a/libavcodec/x86/mpegvideo.c +++ b/libavcodec/x86/mpegvideo.c @@ -26,7 +26,7 @@ #include "libavcodec/mpegvideo.h" #include "dsputil_mmx.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) @@ -574,11 +574,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) { @@ -596,5 +596,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 */ } |