Zane van Iperen: > Signed-off-by: Zane van Iperen <z...@zanevaniperen.com> > --- > libavcodec/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 7dc4ccb85f..8cd2d6f849 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -481,8 +481,8 @@ OBJS-$(CONFIG_MP2_ENCODER) += > mpegaudioenc_float.o mpegaudio.o \ > OBJS-$(CONFIG_MP2FIXED_ENCODER) += mpegaudioenc_fixed.o mpegaudio.o \ > mpegaudiodata.o > mpegaudiodsp_data.o \ > mpegaudiotabs.o > -OBJS-$(CONFIG_MP2FLOAT_DECODER) += mpegaudiodec_float.o > -OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec_fixed.o > +OBJS-$(CONFIG_MP2FLOAT_DECODER) += mpegaudiodec_float.o > mpegaudiodata.o > +OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec_fixed.o > mpegaudiodata.o > OBJS-$(CONFIG_MP3_MF_ENCODER) += mfenc.o mf_utils.o > OBJS-$(CONFIG_MP3ADU_DECODER) += mpegaudiodec_fixed.o > OBJS-$(CONFIG_MP3ADUFLOAT_DECODER) += mpegaudiodec_float.o >
1. This is a regression since 33e6d57f01dd4742a2e25ac5fa072b487d9d02ce. Before that all mpegaudio-decoders had a mpegaudiodata dependency via mpegaudioheader, yet now the latter only needs (and therefore provides) mpegaudiotabs. I should have checked for such indirect dependencies (which should actually not exist, but they unfortunately do), but haven't. 2. This does not fix everything; e.g. it won't fix the issue in which only the mp2 (fixed) decoder is active. Instead mpegaudio should have a mpegaudiodata.o dependency (mpegaudio is the common group for all the decoders that use mpegaudiodec_template). I'll send a patch that does this (and backport it) unless you want to. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
