diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c b/chromium/third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c index 1f02a6f7090..cc3eba4e9af 100644 --- a/chromium/third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c +++ b/chromium/third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c @@ -25,7 +25,6 @@ #include "libavutil/x86/cpu.h" #include "libavutil/x86/asm.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/vp3dsp.h" #include "config.h" @@ -64,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 @@ -95,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)) { |