diff --git a/doc/APIchanges b/doc/APIchanges index d818a0514e..f333ff5b24 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-09-19 - xxxxxxxxxx - lavu 58.25.100 - avutil.h + Make AV_TIME_BASE_Q compatible with C++. + 2023-09-xx - xxxxxxxxxx - lavf 60 - avformat.h Deprecate AVFMT_FLAG_SHORTEST without replacement. diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 30bec192f1..a362c8baa8 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -257,7 +257,12 @@ const char *av_get_media_type_string(enum AVMediaType media_type); * Internal time base represented as fractional value */ +#ifdef __cplusplus +/* ISO C++ forbids compound-literals. */ +#define AV_TIME_BASE_Q av_make_q(1, AV_TIME_BASE) +#else #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} +#endif /** * @} diff --git a/libavutil/version.h b/libavutil/version.h index 132e5ffc84..00f229d233 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 58 -#define LIBAVUTIL_VERSION_MINOR 24 +#define LIBAVUTIL_VERSION_MINOR 25 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \