From e664730271435cb3d2ffb992636e8bb051b7e2d5 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 16 Jan 2017 12:03:21 +0100 Subject: [PATCH] configure: Fix standalone compilation of aiff and caf muxers. --- configure | 2 ++ libavformat/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b2fb9605ed..499fc929ef 100755 --- a/configure +++ b/configure @@ -2886,6 +2886,7 @@ vt_bt2020_deps="kCVImageBufferColorPrimaries_ITU_R_2020" # demuxers / muxers ac3_demuxer_select="ac3_parser" +aiff_muxer_select="iso_media" asf_demuxer_select="riffdec" asf_o_demuxer_select="riffdec" asf_muxer_select="riffenc" @@ -2893,6 +2894,7 @@ asf_stream_muxer_select="asf_muxer" avi_demuxer_select="iso_media riffdec exif" avi_muxer_select="riffenc" caf_demuxer_select="iso_media riffdec" +caf_muxer_select="iso_media" dash_muxer_select="mp4_muxer" dirac_demuxer_select="dirac_parser" dts_demuxer_select="dca_parser" diff --git a/libavformat/Makefile b/libavformat/Makefile index 119e46bd8e..872b30ef24 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -83,7 +83,7 @@ OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o OBJS-$(CONFIG_AFC_DEMUXER) += afc.o OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \ mov_chan.o -OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o isom.o id3v2enc.o +OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_AMR_DEMUXER) += amr.o OBJS-$(CONFIG_AMR_MUXER) += amr.o @@ -123,7 +123,7 @@ OBJS-$(CONFIG_BRSTM_DEMUXER) += brstm.o OBJS-$(CONFIG_C93_DEMUXER) += c93.o voc_packet.o vocdec.o voc.o OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov.o mov_chan.o \ replaygain.o -OBJS-$(CONFIG_CAF_MUXER) += cafenc.o caf.o riff.o isom.o +OBJS-$(CONFIG_CAF_MUXER) += cafenc.o caf.o riff.o OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o