aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2010-09-21 22:21:12 +0000
committerDiego Biurrun <diego@biurrun.de>2010-09-21 22:21:12 +0000
commit26d5112c5709ccd0a363160d8253133a3a963648 (patch)
tree825731ea0c0e2b833173ae0c29439a5238ec7036 /libavformat
parentb41626762253e3d08f8a61db36fcbd1766e4de09 (diff)
downloadffmpeg-26d5112c5709ccd0a363160d8253133a3a963648.tar.gz
cosmetics: Place concat protocol entry in alphabetical order.
Originally committed as revision 25155 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 50ff5deb60..fb9b176b76 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -292,6 +292,7 @@ OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o riff.o
# protocols I/O
OBJS+= avio.o aviobuf.o
+OBJS-$(CONFIG_CONCAT_PROTOCOL) += concat.o
OBJS-$(CONFIG_FILE_PROTOCOL) += file.o
OBJS-$(CONFIG_GOPHER_PROTOCOL) += gopher.o
OBJS-$(CONFIG_HTTP_PROTOCOL) += http.o httpauth.o
@@ -308,7 +309,6 @@ OBJS-$(CONFIG_RTMP_PROTOCOL) += $(RTMP-OBJS-yes)
OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o
-OBJS-$(CONFIG_CONCAT_PROTOCOL) += concat.o
# libavdevice dependencies
OBJS-$(CONFIG_JACK_INDEV) += timefilter.o