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/vp3dsp_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/vp3dsp_init.c')
| -rw-r--r-- | libavcodec/x86/vp3dsp_init.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/x86/vp3dsp_init.c b/libavcodec/x86/vp3dsp_init.c index 709e49add3..cc3eba4e9a 100644 --- a/libavcodec/x86/vp3dsp_init.c +++ b/libavcodec/x86/vp3dsp_init.c @@ -63,6 +63,7 @@ void ff_vp3_h_loop_filter_mmxext(uint8_t *src, int stride, "paddb "#regb", "#regr" \n\t" \ "paddb "#regd", "#regp" \n\t" +#if HAVE_6REGS static void put_vp_no_rnd_pixels8_l2_mmx(uint8_t *dst, const uint8_t *a, const uint8_t *b, ptrdiff_t stride, int h) { // START_TIMER @@ -94,15 +95,16 @@ 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_6REGS */ #endif /* HAVE_MMX_INLINE */ av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags) { int cpu_flags = av_get_cpu_flags(); -#if HAVE_MMX_INLINE +#if HAVE_6REGS && HAVE_MMX_INLINE c->put_no_rnd_pixels_l2 = put_vp_no_rnd_pixels8_l2_mmx; -#endif /* HAVE_MMX_INLINE */ +#endif /* HAVE_6REGS && HAVE_MMX_INLINE */ #if ARCH_X86_32 if (EXTERNAL_MMX(cpu_flags)) { |