diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 12:32:59 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-19 18:28:38 +0200 |
| commit | 468644f6c185c23affcb36939192b03cd166797f (patch) | |
| tree | bb46e12c6dd66f1fc9723affa8da7028087c4245 | |
| parent | 575c18da1b5053e244ccbfbcced176b5a63dbb25 (diff) | |
| download | ffmpeg-468644f6c185c23affcb36939192b03cd166797f.tar.gz | |
lavf: remove FF_API_URL_RESETBUF cruft
| -rw-r--r-- | libavformat/avio.h | 8 | ||||
| -rw-r--r-- | libavformat/aviobuf.c | 11 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
3 files changed, 0 insertions, 22 deletions
diff --git a/libavformat/avio.h b/libavformat/avio.h index f4674a43be..213baaab72 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -542,14 +542,6 @@ int avio_get_str16le(AVIOContext *pb, int maxlen, char *buf, int buflen); int avio_get_str16be(AVIOContext *pb, int maxlen, char *buf, int buflen); -#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 - * to set up the buffer for writing. */ -int url_resetbuf(AVIOContext *s, int flags); -#endif - /** * @defgroup open_modes URL open modes * The flags argument to avio_open must be one of the following diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index cde5f269b5..2bacedbaa7 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -38,9 +38,7 @@ #define SHORT_SEEK_THRESHOLD 4096 static void fill_buffer(AVIOContext *s); -#if !FF_API_URL_RESETBUF static int url_resetbuf(AVIOContext *s, int flags); -#endif int ffio_init_context(AVIOContext *s, unsigned char *buffer, @@ -878,18 +876,9 @@ int ffio_set_buf_size(AVIOContext *s, int buf_size) return 0; } -#if FF_API_URL_RESETBUF -int url_resetbuf(AVIOContext *s, int flags) -#else static int url_resetbuf(AVIOContext *s, int flags) -#endif { -#if FF_API_URL_RESETBUF - if (flags & AVIO_RDWR) - return AVERROR(EINVAL); -#else assert(flags == AVIO_WRONLY || flags == AVIO_RDONLY); -#endif if (flags & AVIO_WRONLY) { s->buf_end = s->buffer + s->buffer_size; diff --git a/libavformat/version.h b/libavformat/version.h index 8f0316b05d..aecc9618d1 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -47,9 +47,6 @@ #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 |