diff options
| author | James Almer <jamrial@gmail.com> | 2024-01-20 10:46:11 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-07 08:53:30 -0300 |
| commit | aaefe47913c01cf4126b5fd4f53a5e8ecceade4d (patch) | |
| tree | 8216c0478b12a4e645d2c7b1f9d8fd06791fc685 | |
| parent | c4c6c9e9d28e492276343463ead020858ea18736 (diff) | |
| download | ffmpeg-aaefe47913c01cf4126b5fd4f53a5e8ecceade4d.tar.gz | |
avformat: remove deprecated FF_API_AVIODIRCONTEXT
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/avio.c | 2 | ||||
| -rw-r--r-- | libavformat/avio.h | 6 | ||||
| -rw-r--r-- | libavformat/version_major.h | 1 |
3 files changed, 0 insertions, 9 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 5186c2b464..1486f555aa 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -721,11 +721,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 43bce60ffd..2241e3484b 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 1bef181473..a2d79e2bd0 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) |