From 5ad2f0bfb23c757bcd02875c6664ff383630790d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 29 Nov 2012 10:34:54 +0100 Subject: build: Add rtpenc_chain extra config option 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. --- libavformat/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavformat/Makefile') diff --git a/libavformat/Makefile b/libavformat/Makefile index fa9366d..14e3e1e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -41,6 +41,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 @@ -167,8 +168,7 @@ OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o pcm.o OBJS-$(CONFIG_MMF_MUXER) += mmf.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 + movenchint.o mov_chan.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 @@ -282,9 +282,9 @@ 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_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_SEGAFILM_DEMUXER) += segafilm.o OBJS-$(CONFIG_SEGMENT_MUXER) += segment.o -- cgit v1.1