From 364cacc7c7767f5ce147b4af5116fd5c427b0d5a Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Thu, 19 Aug 2010 21:28:43 +0000
Subject: [PATCH] add FF_API_URL_RESETBUF define to disable the deprecated
 url_resetbuf() public function

Originally committed as revision 24841 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/avformat.h | 3 +++
 libavformat/avio.h     | 2 +-
 libavformat/aviobuf.c  | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index d61e293669..b95aaa4685 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -48,6 +48,9 @@
 #ifndef FF_API_URL_CLASS
 #define FF_API_URL_CLASS     (LIBAVFORMAT_VERSION_MAJOR >= 53)
 #endif
+#ifndef FF_API_URL_RESETBUF
+#define FF_API_URL_RESETBUF       (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
 #ifndef FF_API_REGISTER_PROTOCOL
 #define FF_API_REGISTER_PROTOCOL  (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 8c5f94acb8..a33a7d98a8 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -454,7 +454,7 @@ int url_fdopen(ByteIOContext **s, URLContext *h);
 
 /** @warning must be called before any I/O */
 int url_setbufsize(ByteIOContext *s, int buf_size);
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_URL_RESETBUF
 /** Reset the buffer for reading or writing.
  * @note Will drop any data currently in the buffer without transmitting it.
  * @param flags URL_RDONLY to set up the buffer for reading, or URL_WRONLY
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 2a96f5aaa3..faae089195 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -36,7 +36,7 @@
 #define SHORT_SEEK_THRESHOLD 4096
 
 static void fill_buffer(ByteIOContext *s);
-#if LIBAVFORMAT_VERSION_MAJOR >= 53
+#if !FF_API_URL_RESETBUF
 static int url_resetbuf(ByteIOContext *s, int flags);
 #endif
 
@@ -632,13 +632,13 @@ int url_setbufsize(ByteIOContext *s, int buf_size)
     return 0;
 }
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_URL_RESETBUF
 int url_resetbuf(ByteIOContext *s, int flags)
 #else
 static int url_resetbuf(ByteIOContext *s, int flags)
 #endif
 {
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_URL_RESETBUF
     if (flags & URL_RDWR)
         return AVERROR(EINVAL);
 #else