avformat/options: Deprecate av_fmt_ctx_get_duration_estimation_method()

Forgotten in b7785d10b00c88029d8af7dbddac09ab0d6f2b7f.

Andreas Rheinhardt committed 2 years ago

Commit 49707b01 parent d65908c5 files · +12 −1Browse files

Showing the changes to libavformat (4 of 5 files). Show all

Unified · Split

4 files

  */
 void av_format_inject_global_side_data(AVFormatContext *s);
+#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

     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)
 {

@@ -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

Keyboard shortcuts