[FFmpeg-cvslog] avio: deprecate url_close_buf

Anton Khirnov git at videolan.org
Thu Mar 17 17:49:24 CET 2011


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

avio: deprecate url_close_buf

It's not used anywhere and its return value looks broken.

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

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

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

diff --git a/libavformat/avio.h b/libavformat/avio.h
index 74f4d55..01ec9da 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -631,10 +631,10 @@ URLContext *url_fileno(AVIOContext *s);
 attribute_deprecated int url_fget_max_packet_size(AVIOContext *s);
 
 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);
+attribute_deprecated int url_close_buf(AVIOContext *s);
+#endif
 
 /**
  * Open a write only memory stream.
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index b2683ca..2bbcf94 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -1010,13 +1010,13 @@ 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)
 {
     put_flush_packet(s);
     return s->buf_ptr - s->buffer;
 }
+#endif
 
 /* output in a dynamic buffer */
 




More information about the ffmpeg-cvslog mailing list