[FFmpeg-cvslog] avio: deprecate url_open_buf

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Mar 14 20:39:04 2011 +0100| [83fddaeb81f782e06281730a809ae2bf4c86a229] | committer: Ronald S. Bultje

avio: deprecate url_open_buf

It's only used in one place and does the same thing as
avio_alloc_context.

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

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

 ffserver.c            |    3 ++-
 libavformat/avio.h    |    4 ++--
 libavformat/aviobuf.c |    2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 0dccbd1..db0cd12 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2721,7 +2721,8 @@ static int http_receive_data(HTTPContext *c)
             if (!fmt_in)
                 goto fail;
 
-            url_open_buf(&pb, c->buffer, c->buffer_end - c->buffer, URL_RDONLY);
+            pb = avio_alloc_context(c->buffer, c->buffer_end - c->buffer,
+                                    0, NULL, NULL, NULL, NULL);
             pb->is_streamed = 1;
 
             if (av_open_input_stream(&s, pb, c->stream->feed_filename, fmt_in, NULL) < 0) {
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 5388c39..74f4d55 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -629,9 +629,9 @@ URLContext *url_fileno(AVIOContext *s);
  * @deprecated use AVIOContext.max_packet_size directly.
  */
 attribute_deprecated int url_fget_max_packet_size(AVIOContext *s);
-#endif
 
-int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags);
+attribute_deprecated int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags);
+#endif
 
 /** return the written or read size */
 int url_close_buf(AVIOContext *s);
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 3a39821..b2683ca 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -996,6 +996,7 @@ int64_t av_url_read_fseek(AVIOContext *s, int stream_index,
  * back to the server even if CONFIG_MUXERS is false. */
 #if CONFIG_MUXERS || CONFIG_NETWORK
 /* buffer handling */
+#if FF_API_OLD_AVIO
 int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags)
 {
     int ret;
@@ -1009,6 +1010,7 @@ int url_open_buf(AVIOContext **s, uint8_t *buf, int buf_size, int flags)
         av_freep(s);
     return ret;
 }
+#endif
 
 int url_close_buf(AVIOContext *s)
 {