ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Feb 19 12:48:16 2025 -0300| [b2564b0ab8ca84429aefd7907eb32526d07516b1] | committer: James Almer
avformat: remove deprecated FF_API_GET_DUR_ESTIMATE_METHOD Deprecated since 2024-03-06. Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2564b0ab8ca84429aefd7907eb32526d07516b1 --- libavformat/avformat.h | 11 ----------- libavformat/options.c | 7 ------- libavformat/version_major.h | 1 - 3 files changed, 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
