[FFmpeg-devel] [PATCH 10/16] lavf: remove FF_API_PARSE_FRAME_PARAM cruft

[Anton Khirnov]

---
 libavformat/avformat.h |   16 ----------------
 libavformat/utils.c    |   18 ------------------
 libavformat/version.h  |    3 ---
 3 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 5f970ac..08ec5ec 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1360,22 +1360,6 @@ void dump_format(AVFormatContext *ic,
                  const char *url,
                  int is_output);
 
-#if FF_API_PARSE_FRAME_PARAM
-/**
- * Parse width and height out of string str.
- * @deprecated Use av_parse_video_frame_size instead.
- */
-attribute_deprecated int parse_image_size(int *width_ptr, int *height_ptr,
-                                          const char *str);
-
-/**
- * Convert framerate from a string to a fraction.
- * @deprecated Use av_parse_video_frame_rate instead.
- */
-attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base,
-                                          const char *arg);
-#endif
-
 /**
  * Parse datestr and return a corresponding number of microseconds.
  * @param datestr String representing a date or a duration.
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 723188a..586eab0 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3234,24 +3234,6 @@ void dump_format(AVFormatContext *ic,
     av_free(printed);
 }
 
-#if FF_API_PARSE_FRAME_PARAM
-#include "libavcore/parseutils.h"
-
-int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
-{
-    return av_parse_video_size(width_ptr, height_ptr, str);
-}
-
-int parse_frame_rate(int *frame_rate_num, int *frame_rate_den, const char *arg)
-{
-    AVRational frame_rate;
-    int ret = av_parse_video_rate(&frame_rate, arg);
-    *frame_rate_num= frame_rate.num;
-    *frame_rate_den= frame_rate.den;
-    return ret;
-}
-#endif
-
 int64_t av_gettime(void)
 {
     struct timeval tv;
diff --git a/libavformat/version.h b/libavformat/version.h
index a3d75b2..adc0f2a 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -44,9 +44,6 @@
 #ifndef FF_API_URL_CLASS
 #define FF_API_URL_CLASS               (LIBAVFORMAT_VERSION_MAJOR >= 53)
 #endif
-#ifndef FF_API_PARSE_FRAME_PARAM
-#define FF_API_PARSE_FRAME_PARAM       (LIBAVFORMAT_VERSION_MAJOR < 53)
-#endif
 #ifndef FF_API_READ_SEEK
 #define FF_API_READ_SEEK               (LIBAVFORMAT_VERSION_MAJOR < 54)
 #endif
-- 
1.7.2.3