diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 13:47:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 14:17:51 +0200 |
| commit | c91a798a2c3600bc30cb1915eb26774f64b7e133 (patch) | |
| tree | 881da056c867695fae88549474a6d8bd9acd43ab /libavcodec/x86/vc1dsp_init.c | |
| parent | e8fc91e22a608eecccdeb612f91a0998e486426d (diff) | |
| parent | b38910c9790253b362839042a17e13252c1d4b90 (diff) | |
| download | ffmpeg-c91a798a2c3600bc30cb1915eb26774f64b7e133.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation with !HAVE_6REGS.
Use MANGLE in cavsdsp.c to save two registers using gcc.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/vc1dsp_init.c')
| -rw-r--r-- | libavcodec/x86/vc1dsp_init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c index aff4b264e3..9256be3816 100644 --- a/libavcodec/x86/vc1dsp_init.c +++ b/libavcodec/x86/vc1dsp_init.c @@ -27,6 +27,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/cpu.h" +#include "libavutil/x86/asm.h" #include "libavcodec/vc1dsp.h" #include "fpel.h" #include "vc1dsp.h" @@ -86,10 +87,10 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); - if (INLINE_MMX(cpu_flags)) + if (HAVE_6REGS && INLINE_MMX(cpu_flags)) ff_vc1dsp_init_mmx(dsp); - if (INLINE_MMXEXT(cpu_flags)) + if (HAVE_6REGS && INLINE_MMXEXT(cpu_flags)) ff_vc1dsp_init_mmxext(dsp); #define ASSIGN_LF(EXT) \ |