diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-05 11:55:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-05 11:55:41 +0100 |
| commit | 5b4d57455d5b587fb0141823e2d08c9117ad1817 (patch) | |
| tree | cbda11a429baa7ad5ff7f9c8c78270fdcae657ea /libavcodec/x86/cavsdsp.c | |
| parent | be99054e77f1a0380d3597406d042f8e8e52b315 (diff) | |
| parent | 3d7c84747d4b68f3929c98a6e09efea8e53634dc (diff) | |
| download | ffmpeg-5b4d57455d5b587fb0141823e2d08c9117ad1817.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Initialize mmxext after amd3dnow optimizations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 068995dbc5..aaa09d1784 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 */ } |