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
pull/126/head
Stefano Sabatini 16 years ago
parent 21ff7689da
commit 1ca9133fb4
  1. 2
      libavformat/avformat.h
  2. 2
      libavformat/utils.c

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

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

Loading…
Cancel
Save