Forgotten in b7785d10b00c88029d8af7dbddac09ab0d6f2b7f.
Unified · Split
| @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2023-02-09 · 1 unmodified line | |||
| 2 | 2 | ||
| 3 | API changes, most recent first: | 3 | API changes, most recent first: |
| 4 | 4 | ||
| 5 | 2024-03-06 - xxxxxxxxxx - lavf 60.25.100 - avformat.h | ||
| 6 | Deprecate av_fmt_ctx_get_duration_estimation_method(). | ||
| 7 | The relevant field is public and needs no getter to access. | ||
| 8 | |||
| 5 | 2024-03-05 - xxxxxxxxxx - lavf 60.24.100 - avformat.h | 9 | 2024-03-05 - xxxxxxxxxx - lavf 60.24.100 - avformat.h |
| 6 | Add avformat_stream_group_name(). | 10 | Add avformat_stream_group_name(). |
| 7 | 11 | ||
| @@ -2008,12 +2008,16 @@ typedef struct AVFormatContext { · 2007 unmodified lines | |||
| 2008 | */ | 2008 | */ |
| 2009 | void av_format_inject_global_side_data(AVFormatContext *s); | 2009 | void av_format_inject_global_side_data(AVFormatContext *s); |
| 2010 | 2010 | ||
| 2011 | #if FF_API_GET_DUR_ESTIMATE_METHOD | ||
| 2011 | /** | 2012 | /** |
| 2012 | * Returns the method used to set ctx->duration. | 2013 | * Returns the method used to set ctx->duration. |
| 2013 | * | 2014 | * |
| 2014 | * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE. | 2015 | * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE. |
| 2016 | * @deprecated duration_estimation_method is public and can be read directly. | ||
| 2015 | */ | 2017 | */ |
| 2018 | attribute_deprecated | ||
| 2016 | enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx); | 2019 | enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx); |
| 2020 | #endif | ||
| 2017 | 2021 | ||
| 2018 | /** | 2022 | /** |
| 2019 | * @defgroup lavf_core Core functions | 2023 | * @defgroup lavf_core Core functions |
| @@ -198,10 +198,12 @@ FF_ENABLE_DEPRECATION_WARNINGS · 197 unmodified lines | |||
| 198 | return s; | 198 | return s; |
| 199 | } | 199 | } |
| 200 | 200 | ||
| 201 | #if FF_API_GET_DUR_ESTIMATE_METHOD | ||
| 201 | enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx) | 202 | enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx) |
| 202 | { | 203 | { |
| 203 | return ctx->duration_estimation_method; | 204 | return ctx->duration_estimation_method; |
| 204 | } | 205 | } |
| 206 | #endif | ||
| 205 | 207 | ||
| 206 | const AVClass *avformat_get_class(void) | 208 | const AVClass *avformat_get_class(void) |
| 207 | { | 209 | { |
| @@ -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 24 | 34 | #define LIBAVFORMAT_VERSION_MINOR 25 |
| 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, \ |
| @@ -50,6 +50,7 @@ · 49 unmodified lines | |||
| 50 | #define FF_API_ALLOW_FLUSH (LIBAVFORMAT_VERSION_MAJOR < 61) | 50 | #define FF_API_ALLOW_FLUSH (LIBAVFORMAT_VERSION_MAJOR < 61) |
| 51 | #define FF_API_AVSTREAM_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 61) | 51 | #define FF_API_AVSTREAM_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 61) |
| 52 | 52 | ||
| 53 | #define FF_API_GET_DUR_ESTIMATE_METHOD (LIBAVFORMAT_VERSION_MAJOR < 62) | ||
| 53 | 54 | ||
| 54 | #define FF_API_R_FRAME_RATE 1 | 55 | #define FF_API_R_FRAME_RATE 1 |
| 55 | 56 | ||