Commit 0fd27268 authored by stefano's avatar stefano

Drop the deprecated parse_image_size() and parse_frame_rate() functions

at the next libavformat major version bump.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16420 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent fdc1bff1
...@@ -1018,6 +1018,7 @@ void dump_format(AVFormatContext *ic, ...@@ -1018,6 +1018,7 @@ void dump_format(AVFormatContext *ic,
const char *url, const char *url,
int is_output); int is_output);
#if LIBAVFORMAT_VERSION_MAJOR < 53
/** /**
* Parses width and height out of string str. * Parses width and height out of string str.
* @deprecated Use av_parse_video_frame_size instead. * @deprecated Use av_parse_video_frame_size instead.
...@@ -1031,6 +1032,7 @@ attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr, ...@@ -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, attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base,
const char *arg); const char *arg);
#endif
/** /**
* Parses \p datestr and returns a corresponding number of microseconds. * Parses \p datestr and returns a corresponding number of microseconds.
......
...@@ -2849,6 +2849,7 @@ void dump_format(AVFormatContext *ic, ...@@ -2849,6 +2849,7 @@ void dump_format(AVFormatContext *ic,
dump_stream_format(ic, i, index, is_output); 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) int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
{ {
return av_parse_video_frame_size(width_ptr, height_ptr, 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) ...@@ -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; *frame_rate_den= frame_rate.den;
return ret; return ret;
} }
#endif
int64_t av_gettime(void) int64_t av_gettime(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment