Message ID | 20210218034214.2090223-14-andreas.rheinhardt@gmail.com |
---|---|
State | Accepted |
Commit | 215536ad0c4d3ffc406f91fe3c2b412d9c072063 |
Headers | show |
Series | [FFmpeg-devel,01/29] configure, libavcodec/Makefile: Remove spurious CAF demuxer dependencies | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
diff --git a/libavformat/Makefile b/libavformat/Makefile index 10fee749c8..851d2f13ee 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -81,7 +81,7 @@ OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o OBJS-$(CONFIG_ADX_MUXER) += rawenc.o OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o OBJS-$(CONFIG_AFC_DEMUXER) += afc.o -OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \ +OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o \ mov_chan.o replaygain.o OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 4d1c9bbb53..81189316ff 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -20,13 +20,11 @@ */ #include "libavutil/intreadwrite.h" -#include "libavutil/mathematics.h" #include "libavutil/dict.h" #include "avformat.h" #include "internal.h" #include "pcm.h" #include "aiff.h" -#include "isom.h" #include "id3v2.h" #include "mov_chan.h" #include "replaygain.h"
This is a result of the mov channel parsing stuff being factored out of mov.c twice: Once in 91b782720fd0df5571775b6591bc41797d6ecf78 to isom.c and later in 3bab7cd12802dc5abf2c5cc6dec49e9e249ce204. Also remove the isom.h header; and while just at it, remove an unused mathematics.h inclusion. (isom.c actually depends upon mpeg4audio from libavcodec for avpriv_mpeg4audio_get_config2 and avpriv_mpa_freq_tab; yet there is no configure dependency for iso_media which leads to failure of shared builds.) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavformat/Makefile | 2 +- libavformat/aiffdec.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)