Mercurial > libavformat.hg
changeset 6395:89cf0940e3f0 libavformat
add FF_API_URL_RESETBUF define to disable the deprecated url_resetbuf()
public function
| author | aurel |
|---|---|
| date | Thu, 19 Aug 2010 21:28:43 +0000 |
| parents | 896acb967d32 |
| children | c2e5016e2b4e |
| files | avformat.h avio.h aviobuf.c |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Thu Aug 19 21:21:32 2010 +0000 +++ b/avformat.h Thu Aug 19 21:28:43 2010 +0000 @@ -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
--- a/avio.h Thu Aug 19 21:21:32 2010 +0000 +++ b/avio.h Thu Aug 19 21:28:43 2010 +0000 @@ -454,7 +454,7 @@ /** @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
--- a/aviobuf.c Thu Aug 19 21:21:32 2010 +0000 +++ b/aviobuf.c Thu Aug 19 21:28:43 2010 +0000 @@ -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 @@ 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