| Message ID | AM7PR03MB66608C4F73528B3DACF6120B8F4B9@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 07fd34aca744d6ae64cd4756943ce508ee0f9973 |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/Makefile: Add missing mpegaudiodata.o dependency to MPEGAUDIO | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7dc4ccb85f..242b48ff7c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -118,7 +118,8 @@ OBJS-$(CONFIG_MDCT) += mdct_float.o mdct_fixed_32.o OBJS-$(CONFIG_ME_CMP) += me_cmp.o OBJS-$(CONFIG_MEDIACODEC) += mediacodecdec_common.o mediacodec_surface.o mediacodec_wrapper.o mediacodec_sw_buffer.o OBJS-$(CONFIG_MPEG_ER) += mpeg_er.o -OBJS-$(CONFIG_MPEGAUDIO) += mpegaudio.o mpegaudiodec_common.o +OBJS-$(CONFIG_MPEGAUDIO) += mpegaudio.o mpegaudiodec_common.o \ + mpegaudiodata.o OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ mpegaudiodsp_data.o \ mpegaudiodsp_fixed.o \
Before 33e6d57f01dd4742a2e25ac5fa072b487d9d02ce all mpegaudio-decoders had an indirect mpegaudiodata dependency via mpegaudioheader, yet now the latter only needs (and therefore provides) mpegaudiotabs. Given that mpegaudiodec_template.c uses stuff from mpegaudiodata, it should always have had a direct dependency, yet hadn't. This commit adds this missing dependency. (Sorry for not having checked indirect dependencies.) Found-by: Zane van Iperen <zane@zanevaniperen.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)