From 468644f6c185c23affcb36939192b03cd166797f Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 3 Feb 2011 12:32:59 +0100
Subject: lavf: remove FF_API_URL_RESETBUF cruft

---
 libavformat/aviobuf.c | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'libavformat/aviobuf.c')

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;
-- 
cgit v1.2.3