[SCM] libav/experimental: Make (de)muxers for format variants select the main format (de)muxer. It makes little sense to enable the variant without the main format.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:48:56 UTC 2013
The following commit has been merged in the experimental branch:
commit 647c2356a603c12a8cf54a63a121e29ef68e3b53
Author: Diego Biurrun <diego at biurrun.de>
Date: Sun Jul 12 22:31:05 2009 +0000
Make (de)muxers for format variants select the main format (de)muxer.
It makes little sense to enable the variant without the main format.
Originally committed as revision 19420 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/configure b/configure
index 17d9c3b..77e148c 100755
--- a/configure
+++ b/configure
@@ -1155,17 +1155,26 @@ libxvid_encoder_deps="libxvid"
# demuxers / muxers
ac3_demuxer_deps="ac3_parser"
+asf_stream_muxer_select="asf_muxer"
avisynth_demuxer_deps="avisynth"
dirac_demuxer_deps="dirac_parser"
+ipod_muxer_select="mov_muxer"
libnut_demuxer_deps="libnut"
libnut_muxer_deps="libnut"
+matroska_audio_muxer_select="matroska_muxer"
matroska_demuxer_suggest="zlib bzlib"
mov_demuxer_suggest="zlib"
mp3_demuxer_deps="mpegaudio_parser"
+mp4_muxer_select="mov_muxer"
+mpegtsraw_demuxer_select="mpegts_demuxer"
+mxf_d10_muxer_select="mxf_muxer"
+psp_muxer_select="mov_muxer"
redir_demuxer_deps="network"
rtp_muxer_deps="network rtp_protocol"
rtsp_demuxer_deps="sdp_demuxer"
sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
+tg2_muxer_select="mov_muxer"
+tgp_muxer_select="mov_muxer"
# indevs / outdevs
alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 8e8a869..f95b426 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -20,7 +20,6 @@ OBJS-$(CONFIG_APC_DEMUXER) += apc.o
OBJS-$(CONFIG_APE_DEMUXER) += ape.o
OBJS-$(CONFIG_ASF_DEMUXER) += asfdec.o asf.o asfcrypt.o riff.o avlanguage.o
OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o riff.o
-OBJS-$(CONFIG_ASF_STREAM_MUXER) += asfenc.o asf.o riff.o
OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o
OBJS-$(CONFIG_ASS_MUXER) += assenc.o
OBJS-$(CONFIG_AU_DEMUXER) += au.o raw.o
@@ -78,12 +77,10 @@ OBJS-$(CONFIG_IMAGE2PIPE_DEMUXER) += img2.o
OBJS-$(CONFIG_IMAGE2PIPE_MUXER) += img2.o
OBJS-$(CONFIG_INGENIENT_DEMUXER) += raw.o
OBJS-$(CONFIG_IPMOVIE_DEMUXER) += ipmovie.o
-OBJS-$(CONFIG_IPOD_MUXER) += movenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_ISS_DEMUXER) += iss.o
OBJS-$(CONFIG_LMLM4_DEMUXER) += lmlm4.o
OBJS-$(CONFIG_M4V_DEMUXER) += raw.o
OBJS-$(CONFIG_M4V_MUXER) += raw.o
-OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += matroskaenc.o matroska.o riff.o isom.o avc.o flacenc.o
OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o riff.o isom.o
OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o riff.o isom.o avc.o flacenc.o
OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o
@@ -98,7 +95,6 @@ OBJS-$(CONFIG_MOV_MUXER) += movenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_MP2_MUXER) += mp3.o
OBJS-$(CONFIG_MP3_DEMUXER) += mp3.o id3v1.o id3v2.o
OBJS-$(CONFIG_MP3_MUXER) += mp3.o
-OBJS-$(CONFIG_MP4_MUXER) += movenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_MPC_DEMUXER) += mpc.o id3v2.o
OBJS-$(CONFIG_MPC8_DEMUXER) += mpc8.o
OBJS-$(CONFIG_MPEG1SYSTEM_MUXER) += mpegenc.o
@@ -110,7 +106,6 @@ OBJS-$(CONFIG_MPEG1VIDEO_MUXER) += raw.o
OBJS-$(CONFIG_MPEG2VIDEO_MUXER) += raw.o
OBJS-$(CONFIG_MPEGPS_DEMUXER) += mpeg.o
OBJS-$(CONFIG_MPEGTS_DEMUXER) += mpegts.o
-OBJS-$(CONFIG_MPEGTSRAW_DEMUXER) += mpegts.o
OBJS-$(CONFIG_MPEGTS_MUXER) += mpegtsenc.o
OBJS-$(CONFIG_MPEGVIDEO_DEMUXER) += raw.o
OBJS-$(CONFIG_MPJPEG_MUXER) += mpjpeg.o
@@ -119,7 +114,6 @@ OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o
OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o
OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o
OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o audiointerleave.o
-OBJS-$(CONFIG_MXF_D10_MUXER) += mxfenc.o mxf.o audiointerleave.o
OBJS-$(CONFIG_NC_DEMUXER) += ncdec.o
OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o
OBJS-$(CONFIG_NULL_MUXER) += raw.o
@@ -175,7 +169,6 @@ OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += raw.o
OBJS-$(CONFIG_PCM_U32LE_MUXER) += raw.o
OBJS-$(CONFIG_PCM_U8_DEMUXER) += raw.o
OBJS-$(CONFIG_PCM_U8_MUXER) += raw.o
-OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_PVA_DEMUXER) += pva.o
OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o
OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o
@@ -209,8 +202,6 @@ OBJS-$(CONFIG_SOX_MUXER) += soxenc.o
OBJS-$(CONFIG_STR_DEMUXER) += psxstr.o
OBJS-$(CONFIG_SWF_DEMUXER) += swfdec.o
OBJS-$(CONFIG_SWF_MUXER) += swfenc.o
-OBJS-$(CONFIG_TG2_MUXER) += movenc.o riff.o isom.o avc.o
-OBJS-$(CONFIG_TGP_MUXER) += movenc.o riff.o isom.o avc.o
OBJS-$(CONFIG_THP_DEMUXER) += thp.o
OBJS-$(CONFIG_TIERTEXSEQ_DEMUXER) += tiertexseq.o
OBJS-$(CONFIG_TMV_DEMUXER) += tmv.o
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list