summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-03-14 20:39:04 +0100
committerRonald S. Bultje <rsbultje@gmail.com>2011-03-16 22:59:39 -0400
commit83fddaeb81f782e06281730a809ae2bf4c86a229 (patch)
tree203b3ab91985c071a1bbac1accfeddaf6d7251df /libavformat
parenteda4cf92d795ae7e233e83f5ad37209d475b7805 (diff)
downloadffmpeg-83fddaeb81f782e06281730a809ae2bf4c86a229.tar.gz
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@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avio.h4
-rw-r--r--libavformat/aviobuf.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 5388c39c1e..74f4d55d0a 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 3a398210f6..b2683ca602 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)
{