diff mbox series

[FFmpeg-devel] avcodec/x86/Makefile: Don't build empty files

Message ID AS8P250MB07448E77CAE61189C20C68A88F449@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State New
Headers show
Series [FFmpeg-devel] avcodec/x86/Makefile: Don't build empty files | expand

Checks

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

Commit Message

Andreas Rheinhardt Sept. 12, 2022, 3:04 p.m. UTC
Should fix ticket #9909, fixing a regression since
bfb28b5ce89f3e950214b67ea95b45e3355c2caf.

Thanks to Carl Eugen Hoyos for analyzing the issue.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
This would be my solution. What do you think of it?

 libavcodec/x86/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Carl Eugen Hoyos Sept. 15, 2022, 10:03 p.m. UTC | #1
Am Mo., 12. Sept. 2022 um 17:04 Uhr schrieb Andreas Rheinhardt
<andreas.rheinhardt@outlook.com>:
>
> Should fix ticket #9909, fixing a regression since
> bfb28b5ce89f3e950214b67ea95b45e3355c2caf.
>
> Thanks to Carl Eugen Hoyos for analyzing the issue.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> This would be my solution. What do you think of it?

No objection but I do not consider this patch cleaner.

Thank you, Carl Eugen
Andreas Rheinhardt Sept. 15, 2022, 10:12 p.m. UTC | #2
Carl Eugen Hoyos:
> Am Mo., 12. Sept. 2022 um 17:04 Uhr schrieb Andreas Rheinhardt
> <andreas.rheinhardt@outlook.com>:
>>
>> Should fix ticket #9909, fixing a regression since
>> bfb28b5ce89f3e950214b67ea95b45e3355c2caf.
>>
>> Thanks to Carl Eugen Hoyos for analyzing the issue.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
>> ---
>> This would be my solution. What do you think of it?
> 
> No objection but I do not consider this patch cleaner.
> 
> Thank you, Carl Eugen

Then please apply yours.

- Andreas
diff mbox series

Patch

diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 4e448623af..41ca864849 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -140,8 +140,11 @@  X86ASM-OBJS-$(CONFIG_QPELDSP)          += x86/qpeldsp.o                 \
 X86ASM-OBJS-$(CONFIG_RV34DSP)          += x86/rv34dsp.o
 X86ASM-OBJS-$(CONFIG_VC1DSP)           += x86/vc1dsp_loopfilter.o       \
                                           x86/vc1dsp_mc.o
-X86ASM-OBJS-$(CONFIG_IDCTDSP)          += x86/simple_idct10.o           \
-                                          x86/simple_idct.o
+ifdef ARCH_X86_64
+X86ASM-OBJS-$(CONFIG_IDCTDSP)          += x86/simple_idct10.o
+else
+X86ASM-OBJS-$(CONFIG_IDCTDSP)          += x86/simple_idct.o
+endif
 X86ASM-OBJS-$(CONFIG_VIDEODSP)         += x86/videodsp.o
 X86ASM-OBJS-$(CONFIG_VP3DSP)           += x86/vp3dsp.o
 X86ASM-OBJS-$(CONFIG_VP8DSP)           += x86/vp8dsp.o                  \