aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-07 01:29:18 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-07-07 18:23:59 +0200
commit5effd65312dd738fb590f1ce45be30a50aaabc72 (patch)
tree3925838eca8b03f4e857a28ec6dddedb0bef2634
parentcb340ecd7d96a2933efdde16462df7bd6cf97dfe (diff)
downloadffmpeg-5effd65312dd738fb590f1ce45be30a50aaabc72.tar.gz
avcodec/x86/vp3dsp_init: move mmx functions under HAVE_MMX_INLINE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit abce6dfd9ecea358f8def5040f60fcbe7f89e970)
-rw-r--r--libavcodec/x86/vp3dsp_init.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/vp3dsp_init.c b/libavcodec/x86/vp3dsp_init.c
index 288dbcc6f3..75dcdf6811 100644
--- a/libavcodec/x86/vp3dsp_init.c
+++ b/libavcodec/x86/vp3dsp_init.c
@@ -43,7 +43,7 @@ void ff_vp3_v_loop_filter_mmxext(uint8_t *src, int stride,
void ff_vp3_h_loop_filter_mmxext(uint8_t *src, int stride,
int *bounding_values);
-#if HAVE_INLINE_ASM
+#if HAVE_MMX_INLINE
#define MOVQ_BFE(regd) \
__asm__ volatile ( \
@@ -95,15 +95,15 @@ static void put_vp_no_rnd_pixels8_l2_mmx(uint8_t *dst, const uint8_t *a, const u
:"memory");
// STOP_TIMER("put_vp_no_rnd_pixels8_l2_mmx")
}
-#endif /* HAVE_INLINE_ASM */
+#endif /* HAVE_MMX_INLINE */
av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
{
int cpuflags = av_get_cpu_flags();
-#if HAVE_INLINE_ASM
+#if HAVE_MMX_INLINE
c->put_no_rnd_pixels_l2 = put_vp_no_rnd_pixels8_l2_mmx;
-#endif /* HAVE_INLINE_ASM */
+#endif /* HAVE_MMX_INLINE */
#if ARCH_X86_32
if (EXTERNAL_MMX(cpuflags)) {