add FF_API_PARSE_FRAME_PARAM define to disable the deprecated

parse_image_size() and parse_frame_rate() public functions

Originally committed as revision 25485 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 0354f03a479e9efa9109b5e3b5c0951c48fe8307..940fc654cc985621762d28afae8d62bfc69f7e39 100644 (file)
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -66,6 +66,9 @@
 #ifndef FF_API_ALLOC_FORMAT_CONTEXT
 #define FF_API_ALLOC_FORMAT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 53)
 #endif
+#ifndef FF_API_PARSE_FRAME_PARAM
+#define FF_API_PARSE_FRAME_PARAM       (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
 
 /**
  * I return the LIBAVFORMAT_VERSION_INT constant.  You got
@@ -1425,7 +1428,7 @@ void dump_format(AVFormatContext *ic,
                  const char *url,
                  int is_output);
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_PARSE_FRAME_PARAM
 /**
  * Parse width and height out of string str.
  * @deprecated Use av_parse_video_frame_size instead.

diff --git a/libavformat/utils.c b/libavformat/utils.c
index ebcb7d7e4522baa824fd96523ca67309f1fe95a0..56bcfc09b499847f9ea47c85d028248b25d1b39f 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3207,7 +3207,7 @@ void dump_format(AVFormatContext *ic,
     av_free(printed);
 }
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
+#if FF_API_PARSE_FRAME_PARAM
 #include "libavcore/parseutils.h"
 
 int parse_image_size(int *width_ptr, int *height_ptr, const char *str)