diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-07-31 09:47:32 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-03 21:17:56 +0200 |
| commit | b10e218df1cfc3f303830ba7a6ef58ae8dc4969b (patch) | |
| tree | 7908f90ddac4f615abc76f3ed66f5c585206ea71 | |
| parent | eb5c5ae658aaf8cd7c03e1d0a6c84274d3a39a66 (diff) | |
configure, avcodec/Makefile: Make IntraX8 select WMV2DSP, fix MIPS build
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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 ca5a38bee1..8ebe133beb 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 |