Mercurial > libavformat.hg

changeset 4147:b3d75fa26b5c libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop the deprecated parse_image_size() and parse_frame_rate() functions at the next libavformat major version bump.
author stefano
date Sun, 04 Jan 2009 11:04:02 +0000
parents af6cde9a76d1
children 33f55d10246d
files avformat.h utils.c
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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)
 {