[FFmpeg-cvslog] r16420 - in trunk/libavformat: avformat.h utils.c

[stefano]

Author: stefano
Date: Sun Jan  4 12:04:02 2009
New Revision: 16420

Log:
Drop the deprecated parse_image_size() and parse_frame_rate() functions
at the next libavformat major version bump.

Modified:
   trunk/libavformat/avformat.h
   trunk/libavformat/utils.c

Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h	Sun Jan  4 02:36:11 2009	(r16419)
+++ trunk/libavformat/avformat.h	Sun Jan  4 12:04:02 2009	(r16420)
@@ -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_siz
  */
 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.

Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c	Sun Jan  4 02:36:11 2009	(r16419)
+++ trunk/libavformat/utils.c	Sun Jan  4 12:04:02 2009	(r16420)
@@ -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
     *frame_rate_den= frame_rate.den;
     return ret;
 }
+#endif
 
 int64_t av_gettime(void)
 {