highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavf: remove FF_API_URL_RESETBUF cruft

Browse Source
This commit is contained in:
Anton Khirnov
2011-02-03 12:32:59 +01:00
parent 575c18da1b
commit 468644f6c1
3 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/avio.h
View File

@@ -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); 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 * @defgroup open_modes URL open modes
* The flags argument to avio_open must be one of the following * The flags argument to avio_open must be one of the following

11
libavformat/aviobuf.c
View File

@@ -38,9 +38,7 @@
#define SHORT_SEEK_THRESHOLD 4096 #define SHORT_SEEK_THRESHOLD 4096
static void fill_buffer(AVIOContext *s); static void fill_buffer(AVIOContext *s);
#if !FF_API_URL_RESETBUF
static int url_resetbuf(AVIOContext *s, int flags); static int url_resetbuf(AVIOContext *s, int flags);
#endif
int ffio_init_context(AVIOContext *s, int ffio_init_context(AVIOContext *s,
unsigned char *buffer, unsigned char *buffer,
@@ -878,18 +876,9 @@ int ffio_set_buf_size(AVIOContext *s, int buf_size)
return 0; return 0;
} }
#if FF_API_URL_RESETBUF
int url_resetbuf(AVIOContext *s, int flags)
#else
static int url_resetbuf(AVIOContext *s, int flags) 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); assert(flags == AVIO_WRONLY || flags == AVIO_RDONLY);
#endif
if (flags & AVIO_WRONLY) { if (flags & AVIO_WRONLY) {
s->buf_end = s->buffer + s->buffer_size; s->buf_end = s->buffer + s->buffer_size;

3
libavformat/version.h
View File

@@ -47,9 +47,6 @@
#ifndef FF_API_URL_CLASS #ifndef FF_API_URL_CLASS
#define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53) #define FF_API_URL_CLASS (LIBAVFORMAT_VERSION_MAJOR >= 53)
#endif #endif
#ifndef FF_API_URL_RESETBUF
#define FF_API_URL_RESETBUF (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_REGISTER_PROTOCOL #ifndef FF_API_REGISTER_PROTOCOL
#define FF_API_REGISTER_PROTOCOL (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_REGISTER_PROTOCOL (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #endif