virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

build: Add rtpenc_chain extra config option

Browse Source 
Also fixes linking in various configs with only individual parts enabled
because the RTP muxer chaining code depends on the general RTP code,
which is now accounted for.
This commit is contained in:
Diego Biurrun
2012-11-29 10:34:54 +01:00
parent 844c68520e
commit 5ad2f0bfb2
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -1328,6 +1328,7 @@ CONFIG_EXTRA="
nettle nettle
rangecoder rangecoder
rtpdec rtpdec
rtpenc_chain
sinewin sinewin
videodsp videodsp
vp3dsp vp3dsp
@@ -1674,6 +1675,7 @@ ismv_muxer_select="mov_muxer"
matroska_audio_muxer_select="matroska_muxer" matroska_audio_muxer_select="matroska_muxer"
matroska_demuxer_suggest="bzlib lzo zlib" matroska_demuxer_suggest="bzlib lzo zlib"
mov_demuxer_suggest="zlib" mov_demuxer_suggest="zlib"
mov_muxer_select="rtpenc_chain"
mp3_demuxer_select="mpegaudio_parser" mp3_demuxer_select="mpegaudio_parser"
mp4_muxer_select="mov_muxer" mp4_muxer_select="mov_muxer"
mpegts_muxer_select="adts_muxer latm_muxer mpegvideo" mpegts_muxer_select="adts_muxer latm_muxer mpegvideo"
@@ -1685,9 +1687,9 @@ rtp_demuxer_select="sdp_demuxer"
rtp_muxer_select="mpegvideo" rtp_muxer_select="mpegvideo"
rtpdec_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer mov_demuxer" rtpdec_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer mov_demuxer"
rtsp_demuxer_select="http_protocol rtpdec" rtsp_demuxer_select="http_protocol rtpdec"
rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol" rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain"
sap_demuxer_select="sdp_demuxer" sap_demuxer_select="sdp_demuxer"
sap_muxer_select="rtp_muxer rtp_protocol" sap_muxer_select="rtp_muxer rtp_protocol rtpenc_chain"
sdp_demuxer_select="rtpdec" sdp_demuxer_select="rtpdec"
smoothstreaming_muxer_select="ismv_muxer" smoothstreaming_muxer_select="ismv_muxer"
spdif_muxer_select="aac_parser" spdif_muxer_select="aac_parser"

8
libavformat/Makefile
View File

@@ -41,6 +41,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \
rtpdec_svq3.o \ rtpdec_svq3.o \
rtpdec_vp8.o \ rtpdec_vp8.o \
rtpdec_xiph.o rtpdec_xiph.o
OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o
# muxers/demuxers # muxers/demuxers
OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o
@@ -167,8 +168,7 @@ OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o pcm.o
OBJS-$(CONFIG_MMF_MUXER) += mmf.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o
OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o
OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o \ OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o \
movenchint.o rtpenc_chain.o \ movenchint.o mov_chan.o
mov_chan.o
OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o
OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o
OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o
@@ -282,9 +282,9 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \
OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o rtspdec.o httpauth.o \ OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o rtspdec.o httpauth.o \
urldecode.o urldecode.o
OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \ OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \
rtpenc_chain.o urldecode.o urldecode.o
OBJS-$(CONFIG_SAP_DEMUXER) += sapdec.o OBJS-$(CONFIG_SAP_DEMUXER) += sapdec.o
OBJS-$(CONFIG_SAP_MUXER) += sapenc.o rtpenc_chain.o OBJS-$(CONFIG_SAP_MUXER) += sapenc.o
OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o
OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o
OBJS-$(CONFIG_SEGMENT_MUXER) += segment.o OBJS-$(CONFIG_SEGMENT_MUXER) += segment.o