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 /libavformat/aviobuf.c | |
| parent | 575c18da1b5053e244ccbfbcced176b5a63dbb25 (diff) | |
lavf: remove FF_API_URL_RESETBUF cruft
Diffstat (limited to 'libavformat/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 11 |
1 files changed, 0 insertions, 11 deletions
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; |