diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-01-04 11:04:02 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-01-04 11:04:02 +0000 |
| commit | 1ca9133fb42c1cc88e007939cc4322c72a7d9596 (patch) | |
| tree | 3323c0eaa141711b82af971a76714b8283f1dcb5 | |
| parent | 21ff7689da9528e6c21bc2fb9eff51f1e3f1daf4 (diff) | |
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
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index acdcec4251..3f4271ae5f 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 7a91b0f009..80171ca903 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) { |