Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'

[ffmpeg] / libavfilter / vf_noise.c

diff --git a/libavfilter/vf_noise.c b/libavfilter/vf_noise.c
index c29afa27214bbf6a67d2cf6d9a4f4c2d330d87e4..07d1c276c326fa340f10ba9f10ade486fff56f42 100644 (file)
--- a/libavfilter/vf_noise.c
+++ b/libavfilter/vf_noise.c
@@ -289,7 +289,7 @@ static inline void line_noise_avg_c(uint8_t *dst, const uint8_t *src,
 static inline void line_noise_avg_mmx(uint8_t *dst, const uint8_t *src,
                                       int len, int8_t **shift)
 {
-#if HAVE_MMX_INLINE
+#if HAVE_MMX_INLINE && HAVE_6REGS
     x86_reg mmx_len= len&(~7);
 
     __asm__ volatile(
@@ -438,7 +438,9 @@ static av_cold int init(AVFilterContext *ctx)
     if (HAVE_MMX_INLINE &&
         cpu_flags & AV_CPU_FLAG_MMX) {
         n->line_noise = line_noise_mmx;
+#if HAVE_6REGS
         n->line_noise_avg = line_noise_avg_mmx;
+#endif
     }
     if (HAVE_MMXEXT_INLINE &&
         cpu_flags & AV_CPU_FLAG_MMXEXT)