summaryrefslogtreecommitdiffstats
path: root/libavformat/Makefile
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-08-22 18:28:37 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-12-06 14:09:14 +0100
commit32aedebdc59d5b34ab7a9137855dcc602267e00f (patch)
treed256fa0fd61a23ecd85b280b3e8b9ce984887251 /libavformat/Makefile
parentc3fa6add58288dda34c88a6c0c9e0cc79f29169b (diff)
downloadffmpeg-streaming-32aedebdc59d5b34ab7a9137855dcc602267e00f.zip
ffmpeg-streaming-32aedebdc59d5b34ab7a9137855dcc602267e00f.tar.gz
lavf: add a concat demuxer.
Diffstat (limited to 'libavformat/Makefile')
-rw-r--r--libavformat/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index f8d9995..d3d03b4 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -96,6 +96,7 @@ OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o
OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o
OBJS-$(CONFIG_CDG_DEMUXER) += cdg.o
OBJS-$(CONFIG_CDXL_DEMUXER) += cdxl.o
+OBJS-$(CONFIG_CONCAT_DEMUXER) += concatdec.o
OBJS-$(CONFIG_CRC_MUXER) += crcenc.o
OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o
OBJS-$(CONFIG_DAUD_MUXER) += daud.o
OpenPOWER on IntegriCloud