diff mbox series

[FFmpeg-devel] avfilter/vf_lut3d: fix building with --disable-optimizations

Message ID 20211011061026.54432-1-mindmark@gmail.com
State Accepted
Commit 3ee7250116a362b64a403ef081e47cd68c59791a
Headers show
Series [FFmpeg-devel] avfilter/vf_lut3d: fix building with --disable-optimizations | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Mark Reid Oct. 11, 2021, 6:10 a.m. UTC 
From: Mark Reid <mindmark@gmail.com>

---
 libavfilter/x86/vf_lut3d_init.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Xiang, Haihao Oct. 11, 2021, 7:57 a.m. UTC | #1 
On Sun, 2021-10-10 at 23:10 -0700, mindmark@gmail.com wrote:
> From: Mark Reid <mindmark@gmail.com>
> 
> ---
>  libavfilter/x86/vf_lut3d_init.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/libavfilter/x86/vf_lut3d_init.c b/libavfilter/x86/vf_lut3d_init.c
> index 3b3dd18680..db1a152f51 100644
> --- a/libavfilter/x86/vf_lut3d_init.c
> +++ b/libavfilter/x86/vf_lut3d_init.c
> @@ -48,9 +48,11 @@ static int interp_##name##_##format##_##opt(AVFilterContext
> *ctx, void *arg, int
>      DEFINE_INTERP_FUNC(tetrahedral, pf32, avx)
>      DEFINE_INTERP_FUNC(tetrahedral, p16,  avx)
>  #endif
> +#if HAVE_SSE2_EXTERNAL
>      DEFINE_INTERP_FUNC(tetrahedral, pf32, sse2)
>      DEFINE_INTERP_FUNC(tetrahedral, p16,  sse2)
>  #endif
> +#endif
>  
>  
>  av_cold void ff_lut3d_init_x86(LUT3DContext *s, const AVPixFmtDescriptor
> *desc)
> @@ -78,11 +80,13 @@ av_cold void ff_lut3d_init_x86(LUT3DContext *s, const
> AVPixFmtDescriptor *desc)
>          }
>  #endif
>      } else if (EXTERNAL_SSE2(cpu_flags) && s->interpolation ==
> INTERPOLATE_TETRAHEDRAL && planar) {
> +#if HAVE_SSE2_EXTERNAL
>          if (isfloat) {
>              s->interp = interp_tetrahedral_pf32_sse2;
>          } else if (depth == 16) {
>              s->interp = interp_tetrahedral_p16_sse2;
>          }
> +#endif
>      }
>  #endif
>  }

LGTM and thanks for fixing building issue quickly.

-Haihao
Paul B Mahol Oct. 13, 2021, 4:12 p.m. UTC | #2 
applied
diff mbox series

Patch

diff --git a/libavfilter/x86/vf_lut3d_init.c b/libavfilter/x86/vf_lut3d_init.c
index 3b3dd18680..db1a152f51 100644
--- a/libavfilter/x86/vf_lut3d_init.c
+++ b/libavfilter/x86/vf_lut3d_init.c
@@ -48,9 +48,11 @@  static int interp_##name##_##format##_##opt(AVFilterContext *ctx, void *arg, int
     DEFINE_INTERP_FUNC(tetrahedral, pf32, avx)
     DEFINE_INTERP_FUNC(tetrahedral, p16,  avx)
 #endif
+#if HAVE_SSE2_EXTERNAL
     DEFINE_INTERP_FUNC(tetrahedral, pf32, sse2)
     DEFINE_INTERP_FUNC(tetrahedral, p16,  sse2)
 #endif
+#endif
 
 
 av_cold void ff_lut3d_init_x86(LUT3DContext *s, const AVPixFmtDescriptor *desc)
@@ -78,11 +80,13 @@  av_cold void ff_lut3d_init_x86(LUT3DContext *s, const AVPixFmtDescriptor *desc)
         }
 #endif
     } else if (EXTERNAL_SSE2(cpu_flags) && s->interpolation == INTERPOLATE_TETRAHEDRAL && planar) {
+#if HAVE_SSE2_EXTERNAL
         if (isfloat) {
             s->interp = interp_tetrahedral_pf32_sse2;
         } else if (depth == 16) {
             s->interp = interp_tetrahedral_p16_sse2;
         }
+#endif
     }
 #endif
 }