diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-05-05 08:01:14 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-05-07 23:53:26 +0200 |
| commit | df2416ca97d2627a07a90eabce6fe1a3d184852e (patch) | |
| tree | ac8155f26214a70a3214288548d5da2022d2e405 | |
| parent | db2cd9cabf64086d2914e1d68d1883c8e786b1d3 (diff) | |
| download | ffmpeg-df2416ca97d2627a07a90eabce6fe1a3d184852e.tar.gz | |
Remove remnants of prores_lgpl decoder
Forgotten in 5c6a3604f0592786db557c82de93112745597a2d.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/tests/x86/dct.c | 4 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c index ef0662ae37..7800abc7f7 100644 --- a/libavcodec/tests/x86/dct.c +++ b/libavcodec/tests/x86/dct.c @@ -26,7 +26,7 @@ #include "libavcodec/x86/xvididct.h" #include "libavcodec/x86/simple_idct.h" -#if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_X86ASM +#if CONFIG_PRORES_DECODER && ARCH_X86_64 && HAVE_X86ASM void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize, int16_t *block, int16_t *qmat); @@ -70,7 +70,7 @@ static const struct algo idct_tab_arch[] = { { "XVID-SSE2", ff_xvid_idct_sse2, FF_IDCT_PERM_SSE2, AV_CPU_FLAG_SSE2, 1 }, #endif #endif /* CONFIG_MPEG4_DECODER && HAVE_X86ASM */ -#if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_X86ASM +#if CONFIG_PRORES_DECODER && ARCH_X86_64 && HAVE_X86ASM { "PR-SSE2", ff_prores_idct_put_10_sse2_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 }, # if HAVE_AVX_EXTERNAL { "PR-AVX", ff_prores_idct_put_10_avx_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX, 1 }, diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 21c5e9b0d4..331183f450 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -61,7 +61,6 @@ OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp_init.o OBJS-$(CONFIG_MPEG4_DECODER) += x86/mpeg4videodsp.o x86/xvididct_init.o OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o -OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp_init.o OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp_init.o OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp_init.o OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc_init.o @@ -176,7 +175,6 @@ X86ASM-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o X86ASM-OBJS-$(CONFIG_MPEG4_DECODER) += x86/xvididct.o X86ASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o X86ASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o -X86ASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o X86ASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o X86ASM-OBJS-$(CONFIG_SBC_ENCODER) += x86/sbcdsp.o X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc.o |