highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat: remove deprecated FF_API_AVIODIRCONTEXT

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2024-01-20 10:46:11 -03:00
parent c4c6c9e9d2
commit aaefe47913
3 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avio.c
View File

@@ -721,11 +721,9 @@ int ffurl_delete(const char *url)
return ret; return ret;
} }
#if !FF_API_AVIODIRCONTEXT
struct AVIODirContext { struct AVIODirContext {
struct URLContext *url_context; struct URLContext *url_context;
}; };
#endif
int avio_open_dir(AVIODirContext **s, const char *url, AVDictionary **options) int avio_open_dir(AVIODirContext **s, const char *url, AVDictionary **options)
{ {

6
libavformat/avio.h
View File

@@ -101,13 +101,7 @@ typedef struct AVIODirEntry {
int64_t filemode; /**< Unix file mode, -1 if unknown. */ int64_t filemode; /**< Unix file mode, -1 if unknown. */
} AVIODirEntry; } AVIODirEntry;
#if FF_API_AVIODIRCONTEXT
typedef struct AVIODirContext {
struct URLContext *url_context;
} AVIODirContext;
#else
typedef struct AVIODirContext AVIODirContext; typedef struct AVIODirContext AVIODirContext;
#endif
/** /**
* Different data types that can be returned via the AVIO * Different data types that can be returned via the AVIO

1
libavformat/version_major.h
View File

@@ -42,7 +42,6 @@
* *
*/ */
#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 61) #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_AVFORMAT_IO_CLOSE (LIBAVFORMAT_VERSION_MAJOR < 61)
#define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_AVIO_WRITE_NONCONST (LIBAVFORMAT_VERSION_MAJOR < 61)
#define FF_API_LAVF_SHORTEST (LIBAVFORMAT_VERSION_MAJOR < 61) #define FF_API_LAVF_SHORTEST (LIBAVFORMAT_VERSION_MAJOR < 61)