# HG changeset patch # User stefano # Date 1231067042 0 # Node ID b3d75fa26b5c110c787c6b0536fb2b9c9bbdf0c4 # Parent af6cde9a76d1773d91299e88e36eb3763116515d Drop the deprecated parse_image_size() and parse_frame_rate() functions at the next libavformat major version bump. diff -r af6cde9a76d1 -r b3d75fa26b5c avformat.h --- a/avformat.h Wed Dec 31 02:47:54 2008 +0000 +++ b/avformat.h Sun Jan 04 11:04:02 2009 +0000 @@ -1018,6 +1018,7 @@ 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_frame_rate(int *frame_rate, int *frame_rate_base, const char *arg); +#endif /** * Parses \p datestr and returns a corresponding number of microseconds. diff -r af6cde9a76d1 -r b3d75fa26b5c utils.c --- a/utils.c Wed Dec 31 02:47:54 2008 +0000 +++ b/utils.c Sun Jan 04 11:04:02 2009 +0000 @@ -2849,6 +2849,7 @@ 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 @@ *frame_rate_den= frame_rate.den; return ret; } +#endif int64_t av_gettime(void) {