| Message ID | AS8P250MB0744638D7F9ED9CD262F08778F529@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel] avformat/avio: Schedule AVIODirContext to become an opaque type | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > Users can't make anything with its content. > Making it opaque might allow us to avoid one level of indirection. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > doc/APIchanges | 3 +++ > libavformat/avio.c | 6 ++++++ > libavformat/avio.h | 4 ++++ > libavformat/version_major.h | 1 + > 4 files changed, 14 insertions(+) > > diff --git a/doc/APIchanges b/doc/APIchanges > index b0a41c9e37..195e3b82d4 100644 > --- a/doc/APIchanges > +++ b/doc/APIchanges > @@ -14,6 +14,9 @@ libavutil: 2021-04-27 > > API changes, most recent first: > > +2022-09-26 - xxxxxxxxxx - lavf 59.yy.100 - avio.h > + Make AVIODirContext an opaque type in a future major version bump. > + > 2022-09-26 - xxxxxxxxxx - lavc 59.48.100 - avcodec.h > Deprecate avcodec_enum_to_chroma_pos() and avcodec_chroma_pos_to_enum(). > Use av_chroma_location_enum_to_pos() or av_chroma_location_pos_to_enum() > diff --git a/libavformat/avio.c b/libavformat/avio.c > index 4846bbd8c6..ab1c19a58d 100644 > --- a/libavformat/avio.c > +++ b/libavformat/avio.c > @@ -528,6 +528,12 @@ 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) > { > URLContext *h = NULL; > diff --git a/libavformat/avio.h b/libavformat/avio.h > index 36c3d7b430..7e4aa9a1c8 100644 > --- a/libavformat/avio.h > +++ b/libavformat/avio.h > @@ -101,9 +101,13 @@ 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 099a17873f..86af3ee4a5 100644 > --- a/libavformat/version_major.h > +++ b/libavformat/version_major.h > @@ -47,6 +47,7 @@ > #define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60) > #define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59) > #define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60) > +#define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 60) > > > #define FF_API_R_FRAME_RATE 1 Will apply this patchset tomorrow unless there are objections. - Andreas
diff --git a/doc/APIchanges b/doc/APIchanges index b0a41c9e37..195e3b82d4 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-09-26 - xxxxxxxxxx - lavf 59.yy.100 - avio.h + Make AVIODirContext an opaque type in a future major version bump. + 2022-09-26 - xxxxxxxxxx - lavc 59.48.100 - avcodec.h Deprecate avcodec_enum_to_chroma_pos() and avcodec_chroma_pos_to_enum(). Use av_chroma_location_enum_to_pos() or av_chroma_location_pos_to_enum() diff --git a/libavformat/avio.c b/libavformat/avio.c index 4846bbd8c6..ab1c19a58d 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -528,6 +528,12 @@ 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) { URLContext *h = NULL; diff --git a/libavformat/avio.h b/libavformat/avio.h index 36c3d7b430..7e4aa9a1c8 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -101,9 +101,13 @@ 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 099a17873f..86af3ee4a5 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -47,6 +47,7 @@ #define FF_HLS_TS_OPTIONS (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_API_AVSTREAM_CLASS (LIBAVFORMAT_VERSION_MAJOR > 59) #define FF_API_GET_END_PTS (LIBAVFORMAT_VERSION_MAJOR < 60) +#define FF_API_AVIODIRCONTEXT (LIBAVFORMAT_VERSION_MAJOR < 60) #define FF_API_R_FRAME_RATE 1
Users can't make anything with its content. Making it opaque might allow us to avoid one level of indirection. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- doc/APIchanges | 3 +++ libavformat/avio.c | 6 ++++++ libavformat/avio.h | 4 ++++ libavformat/version_major.h | 1 + 4 files changed, 14 insertions(+)