[FFmpeg-devel] [PATCH 13/16] lavf: remove FF_API_FIRST_FORMAT cruft

[Anton Khirnov]

---
 libavformat/avformat.h |    5 -----
 libavformat/utils.c    |   10 ++--------
 libavformat/version.h  |    3 ---
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index b6b79c2..220f347 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -793,11 +793,6 @@ typedef struct AVPacketList {
     struct AVPacketList *next;
 } AVPacketList;
 
-#if FF_API_FIRST_FORMAT
-attribute_deprecated extern AVInputFormat *first_iformat;
-attribute_deprecated extern AVOutputFormat *first_oformat;
-#endif
-
 /**
  * If f is NULL, returns the first registered input format,
  * if f is non-NULL, returns the next registered input format after f
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 586eab0..5c5318c 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -110,15 +110,9 @@ static void av_frac_add(AVFrac *f, int64_t incr)
 }
 
 /** head of registered input format linked list */
-#if !FF_API_FIRST_FORMAT
-static
-#endif
-AVInputFormat *first_iformat = NULL;
+static AVInputFormat *first_iformat = NULL;
 /** head of registered output format linked list */
-#if !FF_API_FIRST_FORMAT
-static
-#endif
-AVOutputFormat *first_oformat = NULL;
+static AVOutputFormat *first_oformat = NULL;
 
 AVInputFormat  *av_iformat_next(AVInputFormat  *f)
 {
diff --git a/libavformat/version.h b/libavformat/version.h
index 3d0d4d2..1de3892 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -47,9 +47,6 @@
 #ifndef FF_API_READ_SEEK
 #define FF_API_READ_SEEK               (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif
-#ifndef FF_API_FIRST_FORMAT
-#define FF_API_FIRST_FORMAT            (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
 #ifndef FF_API_SYMVER
 #define FF_API_SYMVER                  (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
-- 
1.7.2.3