diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-10 13:44:58 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-23 10:14:26 +0100 |
| commit | 215536ad0c4d3ffc406f91fe3c2b412d9c072063 (patch) | |
| tree | 413198f9e98fbfecb6d8a4ff65778e429a443651 /libavformat | |
| parent | b5207b7afd6ffe53948b7cf3c26d9d141dc19de8 (diff) | |
| download | ffmpeg-215536ad0c4d3ffc406f91fe3c2b412d9c072063.tar.gz | |
avformat/Makefile: Remove outdated AIFF demuxer dependency on iso_media
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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/aiffdec.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index fcb39ce133..448f21cd8e 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" |