From 1ca9133fb42c1cc88e007939cc4322c72a7d9596 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun, 4 Jan 2009 11:04:02 +0000
Subject: [PATCH] Drop the deprecated parse_image_size() and parse_frame_rate()
functions at the next libavformat major version bump.
Originally committed as revision 16420 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/avformat.h | 2 ++
libavformat/utils.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index acdcec4251e..3f4271ae5fe 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1018,6 +1018,7 @@ void dump_format(AVFormatContext *ic,
const char *url,
int is_output);
+#if LIBAVFORMAT_VERSION_MAJOR < 53
/**
* Parses width and height out of string str.
* @deprecated Use av_parse_video_frame_size instead.
@@ -1031,6 +1032,7 @@ attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr,
*/
attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base,
const char *arg);
+#endif
/**
* Parses \p datestr and returns a corresponding number of microseconds.
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7a91b0f0090..80171ca9036 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2849,6 +2849,7 @@ void dump_format(AVFormatContext *ic,
dump_stream_format(ic, i, index, is_output);
}
+#if LIBAVFORMAT_VERSION_MAJOR < 53
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
{
return av_parse_video_frame_size(width_ptr, height_ptr, str);
@@ -2862,6 +2863,7 @@ int parse_frame_rate(int *frame_rate_num, int *frame_rate_den, const char *arg)
*frame_rate_den= frame_rate.den;
return ret;
}
+#endif
int64_t av_gettime(void)
{
--
GitLab