[SCM] libav/experimental: Place the concat protocol entry at the begin of the registered protocol list, restore alphabetical order.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:12:50 UTC 2013
The following commit has been merged in the experimental branch:
commit 88ad2faff8434ea70afe981913de50e572014fb3
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Tue Jul 27 14:34:56 2010 +0000
Place the concat protocol entry at the begin of the registered
protocol list, restore alphabetical order.
Originally committed as revision 24545 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 9a6a549..80475b9 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -221,6 +221,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX (LIBNUT, libnut);
/* protocols */
+ REGISTER_PROTOCOL (CONCAT, concat);
REGISTER_PROTOCOL (FILE, file);
REGISTER_PROTOCOL (GOPHER, gopher);
REGISTER_PROTOCOL (HTTP, http);
@@ -237,5 +238,4 @@ void av_register_all(void)
REGISTER_PROTOCOL (RTP, rtp);
REGISTER_PROTOCOL (TCP, tcp);
REGISTER_PROTOCOL (UDP, udp);
- REGISTER_PROTOCOL (CONCAT, concat);
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list