[FFmpeg-cvslog] avio: deprecate url_open_protocol

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Mar 31 16:00:49 2011 +0200| [333e8943635b794099b1fb04e9d3fbb4b16a75b2] | committer: Anton Khirnov

avio: deprecate url_open_protocol

The unbuffered API will be made private and it's not used anywhere
internally.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=333e8943635b794099b1fb04e9d3fbb4b16a75b2
---

 libavformat/avio.c |    2 ++
 libavformat/avio.h |   22 +++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index d7c2eb4..f6f067d 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -150,6 +150,7 @@ int url_connect(URLContext* uc)
     return 0;
 }
 
+#if FF_API_OLD_AVIO
 int url_open_protocol (URLContext **puc, struct URLProtocol *up,
                        const char *filename, int flags)
 {
@@ -166,6 +167,7 @@ int url_open_protocol (URLContext **puc, struct URLProtocol *up,
     *puc = NULL;
     return ret;
 }
+#endif
 
 #define URL_SCHEME_CHARS                        \
     "abcdefghijklmnopqrstuvwxyz"                \
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 8130c7c..6279cde 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -94,19 +94,15 @@ typedef struct URLPollEntry {
 
 typedef int URLInterruptCB(void);
 
+#if FF_API_OLD_AVIO
 /**
- * Create a URLContext for accessing to the resource indicated by
- * url, and open it using the URLProtocol up.
- *
- * @param puc pointer to the location where, in case of success, the
- * function puts the pointer to the created URLContext
- * @param flags flags which control how the resource indicated by url
- * is to be opened
- * @return 0 in case of success, a negative value corresponding to an
- * AVERROR code in case of failure
+ * @defgroup old_url_funcs Old url_* functions
+ * @deprecated use the buffered API based on AVIOContext instead
+ * @{
  */
-int url_open_protocol (URLContext **puc, struct URLProtocol *up,
-                       const char *url, int flags);
+attribute_deprecated int url_open_protocol (URLContext **puc, struct URLProtocol *up,
+                                            const char *url, int flags);
+#endif
 
 /**
  * Create a URLContext for accessing to the resource indicated by
@@ -339,6 +335,10 @@ int av_register_protocol2(URLProtocol *protocol, int size);
 #define AVIO_SEEKABLE_NORMAL 0x0001 /**< Seeking works like for a local file */
 
 /**
+ * @}
+ */
+
+/**
  * Bytestream IO Context.
  * New fields can be added to the end with minor version bumps.
  * Removal, reordering and changes to existing fields require a major