diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-29 16:05:37 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-29 16:05:37 +0400 |
commit | 2a9443a110e1865523fee32404890097fb6d1d93 (patch) | |
tree | 1efe4011946d8d0dde56c2394188e85751f2c05c | |
parent | ba34e56c0d39e0aa4c93241623b63db81dfef79b (diff) | |
parent | 69583bd3b1eba471366141c945030c163e073e02 (diff) |
Merge commit '69583bd3b1eba471366141c945030c163e073e02'
* commit '69583bd3b1eba471366141c945030c163e073e02':
avfilter: Refactor unconditional filter registration
build: Add rtpenc_chain extra config option
configure: Add --disable-all command line option
Conflicts:
libavfilter/allfilters.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-x | configure | 11 | ||||
-rw-r--r-- | libavfilter/allfilters.c | 36 | ||||
-rw-r--r-- | libavformat/Makefile | 8 |
3 files changed, 25 insertions, 30 deletions
@@ -101,6 +101,7 @@ Configuration options: --disable-runtime-cpudetect disable detecting cpu capabilities at runtime (smaller binary) --enable-gray enable full grayscale support (slower color) --disable-swscale-alpha disable alpha channel support in swscale + --disable-all disable building components, libraries and programs Program options: --disable-programs do not build command line programs @@ -1483,6 +1484,7 @@ CONFIG_EXTRA=" nettle rangecoder rtpdec + rtpenc_chain sinewin videodsp vp3dsp @@ -1877,6 +1879,7 @@ libnut_muxer_deps="libnut" matroska_audio_muxer_select="matroska_muxer" matroska_demuxer_suggest="bzlib lzo zlib" mov_demuxer_suggest="zlib" +mov_muxer_select="rtpenc_chain" mp3_demuxer_select="mpegaudio_parser" mp4_muxer_select="mov_muxer" mpegts_muxer_select="adts_muxer latm_muxer mpegvideo" @@ -1888,9 +1891,9 @@ rtp_demuxer_select="sdp_demuxer" rtp_muxer_select="mpegvideo" rtpdec_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer mov_demuxer" 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_muxer_select="rtp_muxer rtp_protocol" +sap_muxer_select="rtp_muxer rtp_protocol rtpenc_chain" sdp_demuxer_select="rtpdec" smoothstreaming_muxer_select="ismv_muxer" spdif_muxer_select="aac_parser" @@ -2253,6 +2256,10 @@ for opt do --disable-everything) map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST ;; + --disable-all) + map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST + disable $LIBRARY_LIST $PROGRAM_LIST doc + ;; --enable-random|--disable-random) action=${opt%%-random} do_random ${action#--} $COMPONENT_LIST diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 88b097979c..656d76db63 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -31,6 +31,12 @@ extern AVFilter avfilter_##y##_##x ; \ avfilter_register(&avfilter_##y##_##x ); } +#define REGISTER_FILTER_UNCONDITIONAL(x) \ + { \ + extern AVFilter avfilter_##x; \ + avfilter_register(&avfilter_##x); \ + } + void avfilter_register_all(void) { static int initialized; @@ -169,28 +175,10 @@ void avfilter_register_all(void) /* those filters are part of public or internal API => registered * unconditionally */ - { - extern AVFilter avfilter_vsrc_buffer; - avfilter_register(&avfilter_vsrc_buffer); - } - { - extern AVFilter avfilter_asrc_abuffer; - avfilter_register(&avfilter_asrc_abuffer); - } - { - extern AVFilter avfilter_vsink_buffer; - avfilter_register(&avfilter_vsink_buffer); - } - { - extern AVFilter avfilter_asink_abuffer; - avfilter_register(&avfilter_asink_abuffer); - } - { - extern AVFilter avfilter_af_afifo; - avfilter_register(&avfilter_af_afifo); - } - { - extern AVFilter avfilter_vf_fifo; - avfilter_register(&avfilter_vf_fifo); - } + REGISTER_FILTER_UNCONDITIONAL(asrc_abuffer); + REGISTER_FILTER_UNCONDITIONAL(vsrc_buffer); + REGISTER_FILTER_UNCONDITIONAL(asink_abuffer); + REGISTER_FILTER_UNCONDITIONAL(vsink_buffer); + REGISTER_FILTER_UNCONDITIONAL(af_afifo); + REGISTER_FILTER_UNCONDITIONAL(vf_fifo); } diff --git a/libavformat/Makefile b/libavformat/Makefile index a8a368e628..13fbe7cadf 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -44,6 +44,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_svq3.o \ rtpdec_vp8.o \ rtpdec_xiph.o +OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o # muxers/demuxers OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o @@ -200,8 +201,7 @@ OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o OBJS-$(CONFIG_MMF_MUXER) += mmf.o rawenc.o OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o OBJS-$(CONFIG_MOV_MUXER) += movenc.o isom.o avc.o \ - movenchint.o rtpenc_chain.o \ - mov_chan.o rtp.o + movenchint.o mov_chan.o rtp.o OBJS-$(CONFIG_MP2_MUXER) += mp3enc.o rawenc.o id3v2enc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o @@ -321,10 +321,10 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ OBJS-$(CONFIG_RTSP_DEMUXER) += rtsp.o rtspdec.o httpauth.o \ urldecode.o OBJS-$(CONFIG_RTSP_MUXER) += rtsp.o rtspenc.o httpauth.o \ - rtpenc_chain.o urldecode.o + urldecode.o OBJS-$(CONFIG_SAMI_DEMUXER) += samidec.o OBJS-$(CONFIG_SAP_DEMUXER) += sapdec.o -OBJS-$(CONFIG_SAP_MUXER) += sapenc.o rtpenc_chain.o +OBJS-$(CONFIG_SAP_MUXER) += sapenc.o OBJS-$(CONFIG_SBG_DEMUXER) += sbgdec.o OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o |