From d4d2e9fe4e1e93d37fd543092e45041f58fa8c00 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Sat, 21 Oct 2017 22:08:08 -0300
Subject: [PATCH] avformat: Drop deprecated feof() AVIO fuction
Deprecated in 08/2014.
---
libavformat/avio.h | 7 -------
libavformat/aviobuf.c | 7 -------
libavformat/libavformat.v | 2 --
libavformat/version.h | 3 ---
4 files changed, 19 deletions(-)
diff --git a/libavformat/avio.h b/libavformat/avio.h
index f9c5972adae..19ecd96eb77 100644
--- 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 0d4eb051e12..3e9d774a131 100644
--- 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 c961cd8f19c..291a38f8e77 100644
--- 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 8e940597ee6..c0cd7dd409e 100644
--- 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
--
GitLab