diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-09-30 15:04:44 +0200 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2013-12-04 18:52:48 +0100 |
commit | 3d7c84747d4b68f3929c98a6e09efea8e53634dc (patch) | |
tree | da12efb07f4082a702c0f74bc035d6035f67a52d /libavcodec/x86/cavsdsp.c | |
parent | bd8b6185f6d1fb0433f048c4096b858e6f88ded6 (diff) | |
download | ffmpeg-3d7c84747d4b68f3929c98a6e09efea8e53634dc.tar.gz |
x86: Initialize mmxext after amd3dnow optimizations
The mmxext optimizations should be at least equally fast if available and
amd3dnow optimizations are being deprecated. Thus the former should
override the latter, not the other way around.
Diffstat (limited to 'libavcodec/x86/cavsdsp.c')
-rw-r--r-- | libavcodec/x86/cavsdsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/cavsdsp.c b/libavcodec/x86/cavsdsp.c index 9d2b95067f..bc9cbf7411 100644 --- a/libavcodec/x86/cavsdsp.c +++ b/libavcodec/x86/cavsdsp.c @@ -547,12 +547,12 @@ av_cold void ff_cavsdsp_init_x86(CAVSDSPContext *c, AVCodecContext *avctx) if (INLINE_MMX(cpu_flags)) cavsdsp_init_mmx(c, avctx); #endif /* HAVE_MMX_INLINE */ -#if HAVE_MMXEXT_INLINE - if (INLINE_MMXEXT(cpu_flags)) - cavsdsp_init_mmxext(c, avctx); -#endif /* HAVE_MMXEXT_INLINE */ #if HAVE_AMD3DNOW_INLINE if (INLINE_AMD3DNOW(cpu_flags)) cavsdsp_init_3dnow(c, avctx); #endif /* HAVE_AMD3DNOW_INLINE */ +#if HAVE_MMXEXT_INLINE + if (INLINE_MMXEXT(cpu_flags)) + cavsdsp_init_mmxext(c, avctx); +#endif /* HAVE_MMXEXT_INLINE */ } |