# HG changeset patch
# User stefano
# Date 1234707923 0
# Node ID 724c0f6a52dc0302baf25ca9f621dc528757b885
# Parent  7590f1edf959b8811f1ba71ccbf7ff683af57721
Rename register_protocol() to av_register_protocol() and deprecate
register_protocol().

diff -r 7590f1edf959 -r 724c0f6a52dc avformat.h
--- a/avformat.h	Sun Feb 15 14:13:28 2009 +0000
+++ b/avformat.h	Sun Feb 15 14:25:23 2009 +0000
@@ -22,7 +22,7 @@
 #define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 28
+#define LIBAVFORMAT_VERSION_MINOR 29
 #define LIBAVFORMAT_VERSION_MICRO  0
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
diff -r 7590f1edf959 -r 724c0f6a52dc avio.c
--- a/avio.c	Sun Feb 15 14:13:28 2009 +0000
+++ b/avio.c	Sun Feb 15 14:25:23 2009 +0000
@@ -50,7 +50,7 @@
     else  return first_protocol;
 }
 
-int register_protocol(URLProtocol *protocol)
+int av_register_protocol(URLProtocol *protocol)
 {
     URLProtocol **p;
     p = &first_protocol;
@@ -60,6 +60,13 @@
     return 0;
 }
 
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+int register_protocol(URLProtocol *protocol)
+{
+    return av_register_protocol(protocol);
+}
+#endif
+
 int url_open_protocol (URLContext **puc, struct URLProtocol *up,
                        const char *filename, int flags)
 {
diff -r 7590f1edf959 -r 724c0f6a52dc avio.h
--- a/avio.h	Sun Feb 15 14:13:28 2009 +0000
+++ b/avio.h	Sun Feb 15 14:25:23 2009 +0000
@@ -142,7 +142,14 @@
 
 URLProtocol *av_protocol_next(URLProtocol *p);
 
-int register_protocol(URLProtocol *protocol);
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+/**
+ * @deprecated Use av_register_protocol() instead.
+ */
+attribute_deprecated int register_protocol(URLProtocol *protocol);
+#endif
+
+int av_register_protocol(URLProtocol *protocol);
 
 /**
  * Bytestream IO Context.