avformat/avio: Schedule AVIODirContext to become an opaque type

Users can't make anything with its content. Making it opaque might allow us to avoid one level of indirection.

Andreas Rheinhardt committed 4 years ago

Commit d09776d1 parent e4beb305 files · +15 −1Browse files

Unified · Split

5 files

@@ -14,6 +14,9 @@ libavutil: 2021-04-27 · 13 unmodified lines
14		14
15	API changes, most recent first:	15	API changes, most recent first:
16		16
		17	2022-10-03 - xxxxxxxxxx - lavf 59.34.100 - avio.h
		18	Make AVIODirContext an opaque type in a future major version bump.
		19
17	2022-09-27 - 0c0a3deb18 - lavu 57.38.100 - cpu.h	20	2022-09-27 - 0c0a3deb18 - lavu 57.38.100 - cpu.h
18	Add CPU flags for RISC-V vector extensions:	21	Add CPU flags for RISC-V vector extensions:
19	AV_CPU_FLAG_RVV_I32, AV_CPU_FLAG_RVV_F32, AV_CPU_FLAG_RVV_I64,	22	AV_CPU_FLAG_RVV_I32, AV_CPU_FLAG_RVV_F32, AV_CPU_FLAG_RVV_I64,

     return ret;
 }
+#if !FF_API_AVIODIRCONTEXT
+struct AVIODirContext {
+    struct URLContext *url_context;
+};
+#endif
 int avio_open_dir(AVIODirContext **s, const char *url, AVDictionary **options)
 {
     URLContext *h = NULL;

     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

@@ -31,7 +31,7 @@ · 30 unmodified lines
31		31
32	#include "version_major.h"	32	#include "version_major.h"
33		33
34	#define LIBAVFORMAT_VERSION_MINOR 33	34	#define LIBAVFORMAT_VERSION_MINOR 34
35	#define LIBAVFORMAT_VERSION_MICRO 100	35	#define LIBAVFORMAT_VERSION_MICRO 100
36		36
37	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	37	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

@@ -47,6 +47,7 @@ · 46 unmodified lines
47	#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60)	47	#define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60)
48	#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59)	48	#define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59)
49	#define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60)	49	#define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60)
		50	#define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 60)
50		51
51		52
52	#define FF_API_R_FRAME_RATE 1	53	#define FF_API_R_FRAME_RATE 1

Keyboard shortcuts