summaryrefslogtreecommitdiffstats
path: root/libavformat/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-11-29 10:34:54 +0100
committerDiego Biurrun <diego@biurrun.de>2012-12-28 19:18:13 +0100
commit5ad2f0bfb23c757bcd02875c6664ff383630790d (patch)
tree316debf4e49d7d65b011530da41d308cfe87209f /libavformat/Makefile
parent844c68520eec3d25fe2d6e29def8123758bacc2e (diff)
downloadffmpeg-streaming-5ad2f0bfb23c757bcd02875c6664ff383630790d.zip
ffmpeg-streaming-5ad2f0bfb23c757bcd02875c6664ff383630790d.tar.gz
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.
Diffstat (limited to 'libavformat/Makefile')
-rw-r--r--libavformat/Makefile8
1 files changed, 4 insertions, 4 deletions
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
OpenPOWER on IntegriCloud