[SCM] libav/experimental: cosmetics: Place concat protocol entry in alphabetical order.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:16:01 UTC 2013


The following commit has been merged in the experimental branch:
commit 26d5112c5709ccd0a363160d8253133a3a963648
Author: Diego Biurrun <diego at biurrun.de>
Date:   Tue Sep 21 22:21:12 2010 +0000

    cosmetics: Place concat protocol entry in alphabetical order.
    
    Originally committed as revision 25155 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 50ff5de..fb9b176 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

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list