diff mbox series

[FFmpeg-devel,2/4] configure, avcodec/Makefile: Make IntraX8 select WMV2DSP, fix MIPS build

Message ID DB6PR0101MB2214D4C598EE29983B9F8C8A8F9B9@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com
State Accepted
Commit b10e218df1cfc3f303830ba7a6ef58ae8dc4969b
Headers show
Series [FFmpeg-devel,1/4] avcodec/intrax8: Remove unused IDCTDSPContext | expand

Checks

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

Commit Message

Andreas Rheinhardt July 31, 2022, 9:41 a.m. UTC 
IntraX8 uses WMV2DSP directly, so it should have a direct dependency
on it. Also remove the indirect Makefile dependency of the VC-1 decoder
on wmv2dsp.o. Notice that since the addition of the MIPS WMV2DSP
implementation building only the VC-1 decoder would fail, because
no Makefile dependency VC1->wmv2dsp_init_mips.o has been added.
This is of course fixed by this commit.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 configure           | 2 +-
 libavcodec/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/configure b/configure
index 974768a663..ff075fb950 100755
--- a/configure
+++ b/configure
@@ -2733,7 +2733,7 @@  h264dsp_select="startcode"
 hevcparse_select="atsc_a53 golomb"
 frame_thread_encoder_deps="encoders threads"
 inflate_wrapper_deps="zlib"
-intrax8_select="blockdsp"
+intrax8_select="blockdsp wmv2dsp"
 iso_media_select="mpeg4audio"
 mdct_select="fft"
 mdct15_select="fft"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index aff7752856..a6311411d3 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -723,7 +723,7 @@  OBJS-$(CONFIG_VBLE_DECODER)            += vble.o
 OBJS-$(CONFIG_VC1_DECODER)             += vc1dec.o vc1_block.o vc1_loopfilter.o \
                                           vc1_mc.o vc1_pred.o vc1.o vc1data.o \
                                           msmpeg4dec.o msmpeg4.o msmpeg4data.o \
-                                          wmv2dsp.o wmv2data.o
+                                          wmv2data.o
 OBJS-$(CONFIG_VC1_CUVID_DECODER)       += cuviddec.o
 OBJS-$(CONFIG_VC1_MMAL_DECODER)        += mmaldec.o
 OBJS-$(CONFIG_VC1_QSV_DECODER)         += qsvdec.o