diff options
| author | James Almer <jamrial@gmail.com> | 2025-02-19 12:48:16 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2025-03-28 14:33:07 -0300 |
| commit | b2564b0ab8ca84429aefd7907eb32526d07516b1 (patch) | |
| tree | f7aa05d7054281f76d7423788b8b0541837d52cb | |
| parent | ec8e796b42bccf999fdf31c110385e2cc119b7f2 (diff) | |
| download | ffmpeg-b2564b0ab8ca84429aefd7907eb32526d07516b1.tar.gz | |
avformat: remove deprecated FF_API_GET_DUR_ESTIMATE_METHOD
Deprecated since 2024-03-06.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/avformat.h | 11 | ||||
| -rw-r--r-- | libavformat/options.c | 7 | ||||
| -rw-r--r-- | libavformat/version_major.h | 1 |
3 files changed, 0 insertions, 19 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a3e45c1417..498c3020a5 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1891,17 +1891,6 @@ typedef struct AVFormatContext { int64_t duration_probesize; } AVFormatContext; -#if FF_API_GET_DUR_ESTIMATE_METHOD -/** - * Returns the method used to set ctx->duration. - * - * @return AVFMT_DURATION_FROM_PTS, AVFMT_DURATION_FROM_STREAM, or AVFMT_DURATION_FROM_BITRATE. - * @deprecated duration_estimation_method is public and can be read directly. - */ -attribute_deprecated -enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx); -#endif - /** * @defgroup lavf_core Core functions * @ingroup libavf diff --git a/libavformat/options.c b/libavformat/options.c index 76b91169a5..7e4130b405 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -187,13 +187,6 @@ AVFormatContext *avformat_alloc_context(void) return s; } -#if FF_API_GET_DUR_ESTIMATE_METHOD -enum AVDurationEstimationMethod av_fmt_ctx_get_duration_estimation_method(const AVFormatContext* ctx) -{ - return ctx->duration_estimation_method; -} -#endif - const AVClass *avformat_get_class(void) { return &av_format_context_class; diff --git a/libavformat/version_major.h b/libavformat/version_major.h index aec4ee6e74..f5efa4db33 100644 --- a/libavformat/version_major.h +++ b/libavformat/version_major.h @@ -43,7 +43,6 @@ */ #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 62) -#define FF_API_GET_DUR_ESTIMATE_METHOD (LIBAVFORMAT_VERSION_MAJOR < 62) #define FF_API_INTERNAL_TIMING (LIBAVFORMAT_VERSION_MAJOR < 62) #define FF_API_R_FRAME_RATE 1 |