ffmpeg | branch: master | Zhao Zhili <[email protected]> | Thu Aug 17 22:27:03 2023 +0800| [ff094f5ebbdae504f5bcd722351563b5d9777c21] | committer: James Almer
avutil/channel_layout: make pre-defined channel layouts C++ friendly C++ doesn't support designated initializers until C++20. We have a bunch of pre-defined channel layouts, the gains to make them usable in C++ exceed the losses. Bump minor version so C++ project can check before use these defines. Also initialize .opaque field explicitly to reduce warning in C++. Signed-off-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff094f5ebbdae504f5bcd722351563b5d9777c21 --- doc/APIchanges | 3 +++ libavutil/channel_layout.h | 16 ++++++++++++++-- libavutil/version.h | 4 ++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index e1096baab0..f9eb7f4dab 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-08-18 - xxxxxxxxxx - lavu 58.17.100 - channel_layout.h + All AV_CHANNEL_LAYOUT_* macros are now compatible with C++ 17 and older. + 2023-08-08 - xxxxxxxxxx - lavc 60.23.100 - libx264.c Add mb_info option. diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index f345415c55..ac2ddfa022 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -358,8 +358,16 @@ typedef struct AVChannelLayout { void *opaque; } AVChannelLayout; +/** + * Macro to define native channel layouts + * + * @note This doesn't use designated initializers for compatibility with C++ 17 and older. + */ #define AV_CHANNEL_LAYOUT_MASK(nb, m) \ - { .order = AV_CHANNEL_ORDER_NATIVE, .nb_channels = (nb), .u = { .mask = (m) }} + { /* .order */ AV_CHANNEL_ORDER_NATIVE, \ + /* .nb_channels */ (nb), \ + /* .u.mask */ { m }, \ + /* .opaque */ NULL } /** * @name Common pre-defined channel layouts @@ -396,8 +404,12 @@ typedef struct AVChannelLayout { #define AV_CHANNEL_LAYOUT_HEXADECAGONAL AV_CHANNEL_LAYOUT_MASK(16, AV_CH_LAYOUT_HEXADECAGONAL) #define AV_CHANNEL_LAYOUT_STEREO_DOWNMIX AV_CHANNEL_LAYOUT_MASK(2, AV_CH_LAYOUT_STEREO_DOWNMIX) #define AV_CHANNEL_LAYOUT_22POINT2 AV_CHANNEL_LAYOUT_MASK(24, AV_CH_LAYOUT_22POINT2) + #define AV_CHANNEL_LAYOUT_AMBISONIC_FIRST_ORDER \ - { .order = AV_CHANNEL_ORDER_AMBISONIC, .nb_channels = 4, .u = { .mask = 0 }} + { /* .order */ AV_CHANNEL_ORDER_AMBISONIC, \ + /* .nb_channels */ 4, \ + /* .u.mask */ { 0 }, \ + /* .opaque */ NULL } /** @} */ struct AVBPrint; diff --git a/libavutil/version.h b/libavutil/version.h index 5a4d4d3d73..bc43baca9f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 58 -#define LIBAVUTIL_VERSION_MINOR 16 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 17 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
