[FFmpeg-cvslog] configure, libavcodec/Makefile: Remove spurious CAF demuxer dependencies

Andreas Rheinhardt git at videolan.org
Tue Feb 23 12:36:05 EET 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Tue Feb  9 14:41:53 2021 +0100| [3b26d030b559f59025b4d7f1718895832981f1ae] | committer: Andreas Rheinhardt

configure, libavcodec/Makefile: Remove spurious CAF demuxer dependencies

Forgotten in 604fbb3132e88727e496c96c92cfe02748c25a1a.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b26d030b559f59025b4d7f1718895832981f1ae
---

 configure           | 2 +-
 libavcodec/Makefile | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure b/configure
index 98daa1a64a..b5ef35c034 100755
--- a/configure
+++ b/configure
@@ -3309,7 +3309,7 @@ asf_stream_muxer_select="asf_muxer"
 av1_demuxer_select="av1_frame_merge_bsf av1_parser"
 avi_demuxer_select="iso_media riffdec exif"
 avi_muxer_select="riffenc"
-caf_demuxer_select="iso_media riffdec"
+caf_demuxer_select="iso_media"
 caf_muxer_select="iso_media"
 dash_muxer_select="mp4_muxer"
 dash_demuxer_deps="libxml2"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 6ec1d360ac..d8258de59a 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -976,7 +976,6 @@ OBJS-$(CONFIG_VP8_QSV_HWACCEL)            += qsvdec.o
 OBJS-$(CONFIG_ISO_MEDIA)               += mpeg4audio.o mpegaudiodata.o
 
 OBJS-$(CONFIG_ADTS_MUXER)              += mpeg4audio.o
-OBJS-$(CONFIG_CAF_DEMUXER)             += ac3tab.o
 OBJS-$(CONFIG_CODEC2_DEMUXER)          += codec2utils.o
 OBJS-$(CONFIG_CODEC2_MUXER)            += codec2utils.o
 OBJS-$(CONFIG_CODEC2RAW_DEMUXER)       += codec2utils.o



More information about the ffmpeg-cvslog mailing list