avformat: Drop deprecated feof() AVIO fuction

Deprecated in 08/2014.

diff --git a/libavformat/avio.h b/libavformat/avio.h
index f9c5972adae65d47d29a5cdc9c186694b1ce5f2f..19ecd96eb77abaca6f422a209b118673b00977c9 100644 (file)
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -569,13 +569,6 @@ int64_t avio_size(AVIOContext *s);
  * @return non zero if and only if end of file
  */
 int avio_feof(AVIOContext *s);
-#if FF_API_URL_FEOF
-/**
- * @deprecated use avio_feof()
- */
-attribute_deprecated
-int url_feof(AVIOContext *s);
-#endif
 
 /** @warning Writes up to 4 KiB per call */
 int avio_printf(AVIOContext *s, const char *fmt, ...) av_printf_format(2, 3);

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 0d4eb051e121974deb786584473ebf79d1894534..3e9d774a1311d9dd636b7097f7751157bf0d7bd5 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -364,13 +364,6 @@ int avio_feof(AVIOContext *s)
     return s->eof_reached;
 }
 
-#if FF_API_URL_FEOF
-int url_feof(AVIOContext *s)
-{
-    return avio_feof(s);
-}
-#endif
-
 void avio_wl32(AVIOContext *s, unsigned int val)
 {
     avio_w8(s, (uint8_t) val       );

diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v
index c961cd8f19ccdd3ddffb7da9e56356e8d60403b5..291a38f8e771452778fed45ba9c5e5c5df78ac58 100644 (file)
--- a/libavformat/libavformat.v
+++ b/libavformat/libavformat.v
@@ -12,8 +12,6 @@ LIBAVFORMAT_MAJOR {
         ffurl_close;
         ffurl_open;
         ffurl_write;
-        #those are deprecated, remove on next bump
-        url_feof;
     local:
         *;
 };

diff --git a/libavformat/version.h b/libavformat/version.h
index 8e940597ee68ac211998fa6d6063eac7a789909f..c0cd7dd409eea9183482de02cfb78a7d3f2b4288 100644 (file)
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -55,9 +55,6 @@
  * at once through the bump. This improves the git bisect-ability of the change.
  *
  */
-#ifndef FF_API_URL_FEOF
-#define FF_API_URL_FEOF                 (LIBAVFORMAT_VERSION_MAJOR < 58)
-#endif
 #ifndef FF_API_LAVF_FMT_RAWPICTURE
 #define FF_API_LAVF_FMT_RAWPICTURE      (LIBAVFORMAT_VERSION_MAJOR < 58)
 #endif