[FFmpeg-devel] [PATCH 10/24] avformat: remove deprecated FF_API_AVIODIRCONTEXT

[James Almer]

Signed-off-by: James Almer <jamrial at gmail.com>
---
 libavformat/avio.c          | 2 --
 libavformat/avio.h          | 6 ------
 libavformat/version_major.h | 1 -
 3 files changed, 9 deletions(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index b793a7546c..6a9bd86754 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -529,11 +529,9 @@ int ffurl_delete(const char *url)
     return ret;
 }
 
-#if !FF_API_AVIODIRCONTEXT
 struct AVIODirContext {
     struct URLContext *url_context;
 };
-#endif
 
 int avio_open_dir(AVIODirContext **s, const char *url, AVDictionary **options)
 {
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 887a397c37..fc0d314edb 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -101,13 +101,7 @@ typedef struct AVIODirEntry {
     int64_t filemode;                     /**< Unix file mode, -1 if unknown. */
 } AVIODirEntry;
 
-#if FF_API_AVIODIRCONTEXT
-typedef struct AVIODirContext {
-    struct URLContext *url_context;
-} AVIODirContext;
-#else
 typedef struct AVIODirContext AVIODirContext;
-#endif
 
 /**
  * Different data types that can be returned via the AVIO
diff --git a/libavformat/version_major.h b/libavformat/version_major.h
index 4dfb26cca3..ee1f8bdbb7 100644
--- a/libavformat/version_major.h
+++ b/libavformat/version_major.h
@@ -42,7 +42,6 @@
  *
  */
 #define FF_API_COMPUTE_PKT_FIELDS2      (LIBAVFORMAT_VERSION_MAJOR < 61)
-#define FF_API_AVIODIRCONTEXT           (LIBAVFORMAT_VERSION_MAJOR < 61)
 #define FF_API_AVFORMAT_IO_CLOSE        (LIBAVFORMAT_VERSION_MAJOR < 61)
 #define FF_API_AVIO_WRITE_NONCONST      (LIBAVFORMAT_VERSION_MAJOR < 61)
 #define FF_API_LAVF_SHORTEST            (LIBAVFORMAT_VERSION_MAJOR < 61)
-- 
2.43.0