diff mbox series

[FFmpeg-devel,01/29] configure, libavcodec/Makefile: Remove spurious CAF demuxer dependencies

Message ID 20210218034214.2090223-1-andreas.rheinhardt@gmail.com
State Accepted
Commit 3b26d030b559f59025b4d7f1718895832981f1ae
Headers show
Series [FFmpeg-devel,01/29] configure, libavcodec/Makefile: Remove spurious CAF demuxer dependencies
Related show

Checks

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

Commit Message

Andreas Rheinhardt Feb. 18, 2021, 3:41 a.m. UTC
Forgotten in 604fbb3132e88727e496c96c92cfe02748c25a1a.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 configure           | 2 +-
 libavcodec/Makefile | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

Comments

Andreas Rheinhardt Feb. 22, 2021, 1:27 a.m. UTC | #1
Andreas Rheinhardt:
> Forgotten in 604fbb3132e88727e496c96c92cfe02748c25a1a.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  configure           | 2 +-
>  libavcodec/Makefile | 1 -
>  2 files changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/configure b/configure
> index a76c2ec4ae..c28a7403db 100755
> --- a/configure
> +++ b/configure
> @@ -3308,7 +3308,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 3341801b97..f43e717714 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -974,7 +974,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
> 
Will apply this patchset tonight unless there are objections.

- Andreas
diff mbox series

Patch

diff --git a/configure b/configure
index a76c2ec4ae..c28a7403db 100755
--- a/configure
+++ b/configure
@@ -3308,7 +3308,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 3341801b97..f43e717714 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -974,7 +974,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