[FFmpeg-cvslog] r17322 - in trunk/libavformat: avformat.h avio.c avio.h

[stefano]

Author: stefano
Date: Sun Feb 15 15:25:23 2009
New Revision: 17322

Log:
Rename register_protocol() to av_register_protocol() and deprecate
register_protocol().

Modified:
   trunk/libavformat/avformat.h
   trunk/libavformat/avio.c
   trunk/libavformat/avio.h

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	Sun Feb 15 15:13:28 2009	(r17321)
+++ trunk/libavformat/avformat.h	Sun Feb 15 15:25:23 2009	(r17322)
@@ -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, \

Modified: trunk/libavformat/avio.c
==============================================================================
--- trunk/libavformat/avio.c	Sun Feb 15 15:13:28 2009	(r17321)
+++ trunk/libavformat/avio.c	Sun Feb 15 15:25:23 2009	(r17322)
@@ -50,7 +50,7 @@ URLProtocol *av_protocol_next(URLProtoco
     else  return first_protocol;
 }
 
-int register_protocol(URLProtocol *protocol)
+int av_register_protocol(URLProtocol *protocol)
 {
     URLProtocol **p;
     p = &first_protocol;
@@ -60,6 +60,13 @@ int register_protocol(URLProtocol *proto
     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)
 {

Modified: trunk/libavformat/avio.h
==============================================================================
--- trunk/libavformat/avio.h	Sun Feb 15 15:13:28 2009	(r17321)
+++ trunk/libavformat/avio.h	Sun Feb 15 15:25:23 2009	(r17322)
@@ -142,7 +142,14 @@ extern URLInterruptCB *url_interrupt_cb;
 
 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.