diff mbox series

[FFmpeg-devel,2/2] avcodec/Makefile: Dont compile unused files.

Message ID CAHVN4mgka3mvnzPckyLyBROk20bWzj-etUBhO9U5MRj=WZzWww@mail.gmail.com
State New
Headers show
Series [FFmpeg-devel,1/2] lavfi/Makefile: Dont compile unused files. | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch

Commit Message

Matt Oliver Jan. 15, 2023, 8:09 a.m. UTC 
Multiple asm files dont contain any valid code when compiled under 32bit
x86 so they should be skipped.

---
 libavcodec/x86/Makefile | 8 ++++++++
 1 file changed, 8 insertions(+)

 X86ASM-OBJS-$(CONFIG_DIRAC_DECODER)    += x86/diracdsp.o                \
@@ -176,16 +178,22 @@ X86ASM-OBJS-$(CONFIG_HEVC_DECODER)     +=
x86/hevc_add_res.o            \
                                           x86/hevc_sao_10bit.o
 X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o
 X86ASM-OBJS-$(CONFIG_LSCR_DECODER)     += x86/pngdsp.o
+ifdef ARCH_X86_64
 X86ASM-OBJS-$(CONFIG_MLP_DECODER)      += x86/mlpdsp.o
+endif
 X86ASM-OBJS-$(CONFIG_MPEG4_DECODER)    += x86/xvididct.o
 X86ASM-OBJS-$(CONFIG_PNG_DECODER)      += x86/pngdsp.o
+ifdef ARCH_X86_64
 X86ASM-OBJS-$(CONFIG_PRORES_DECODER)   += x86/proresdsp.o
 X86ASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
+endif
 X86ASM-OBJS-$(CONFIG_RV40_DECODER)     += x86/rv40dsp.o
 X86ASM-OBJS-$(CONFIG_SBC_ENCODER)      += x86/sbcdsp.o
 X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER)     += x86/svq1enc.o
 X86ASM-OBJS-$(CONFIG_TAK_DECODER)      += x86/takdsp.o
+ifdef ARCH_X86_64
 X86ASM-OBJS-$(CONFIG_TRUEHD_DECODER)   += x86/mlpdsp.o
+endif
 X86ASM-OBJS-$(CONFIG_TTA_DECODER)      += x86/ttadsp.o
 X86ASM-OBJS-$(CONFIG_TTA_ENCODER)      += x86/ttaencdsp.o
 X86ASM-OBJS-$(CONFIG_UTVIDEO_DECODER)  += x86/utvideodsp.o

Comments

Matt Oliver Feb. 11, 2023, 6:56 a.m. UTC | #1 
On Sun, 15 Jan 2023 at 19:09, Matt Oliver <protogonoi@gmail.com> wrote:

> Multiple asm files dont contain any valid code when compiled under 32bit
> x86 so they should be skipped.
>
> ---
>  libavcodec/x86/Makefile | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
> index 118daca333..bafba207ca 100644
> --- a/libavcodec/x86/Makefile
> +++ b/libavcodec/x86/Makefile
> @@ -157,7 +157,9 @@ X86ASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) +=
> x86/g722dsp.o
>  X86ASM-OBJS-$(CONFIG_ALAC_DECODER)     += x86/alacdsp.o
>  X86ASM-OBJS-$(CONFIG_APNG_DECODER)     += x86/pngdsp.o
>  X86ASM-OBJS-$(CONFIG_CAVS_DECODER)     += x86/cavsidct.o
> +ifdef ARCH_X86_64
>  X86ASM-OBJS-$(CONFIG_CFHD_ENCODER)     += x86/cfhdencdsp.o
> +endif
>  X86ASM-OBJS-$(CONFIG_CFHD_DECODER)     += x86/cfhddsp.o
>  X86ASM-OBJS-$(CONFIG_DCA_DECODER)      += x86/dcadsp.o x86/synth_filter.o
>  X86ASM-OBJS-$(CONFIG_DIRAC_DECODER)    += x86/diracdsp.o                \
> @@ -176,16 +178,22 @@ X86ASM-OBJS-$(CONFIG_HEVC_DECODER)     +=
> x86/hevc_add_res.o            \
>                                            x86/hevc_sao_10bit.o
>  X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o
>  X86ASM-OBJS-$(CONFIG_LSCR_DECODER)     += x86/pngdsp.o
> +ifdef ARCH_X86_64
>  X86ASM-OBJS-$(CONFIG_MLP_DECODER)      += x86/mlpdsp.o
> +endif
>  X86ASM-OBJS-$(CONFIG_MPEG4_DECODER)    += x86/xvididct.o
>  X86ASM-OBJS-$(CONFIG_PNG_DECODER)      += x86/pngdsp.o
> +ifdef ARCH_X86_64
>  X86ASM-OBJS-$(CONFIG_PRORES_DECODER)   += x86/proresdsp.o
>  X86ASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
> +endif
>  X86ASM-OBJS-$(CONFIG_RV40_DECODER)     += x86/rv40dsp.o
>  X86ASM-OBJS-$(CONFIG_SBC_ENCODER)      += x86/sbcdsp.o
>  X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER)     += x86/svq1enc.o
>  X86ASM-OBJS-$(CONFIG_TAK_DECODER)      += x86/takdsp.o
> +ifdef ARCH_X86_64
>  X86ASM-OBJS-$(CONFIG_TRUEHD_DECODER)   += x86/mlpdsp.o
> +endif
>  X86ASM-OBJS-$(CONFIG_TTA_DECODER)      += x86/ttadsp.o
>  X86ASM-OBJS-$(CONFIG_TTA_ENCODER)      += x86/ttaencdsp.o
>  X86ASM-OBJS-$(CONFIG_UTVIDEO_DECODER)  += x86/utvideodsp.o
> --
> 2.39.0.windows.2
>

bump
diff mbox series

Patch

diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 118daca333..bafba207ca 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -157,7 +157,9 @@  X86ASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) +=
x86/g722dsp.o
 X86ASM-OBJS-$(CONFIG_ALAC_DECODER)     += x86/alacdsp.o
 X86ASM-OBJS-$(CONFIG_APNG_DECODER)     += x86/pngdsp.o
 X86ASM-OBJS-$(CONFIG_CAVS_DECODER)     += x86/cavsidct.o
+ifdef ARCH_X86_64
 X86ASM-OBJS-$(CONFIG_CFHD_ENCODER)     += x86/cfhdencdsp.o
+endif
 X86ASM-OBJS-$(CONFIG_CFHD_DECODER)     += x86/cfhddsp.o
 X86ASM-OBJS-$(CONFIG_DCA_DECODER)      += x86/dcadsp.o x86/synth_filter.o