Commit d87a521c authored by Aurelien Jacobs's avatar Aurelien Jacobs

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
parent ade800c5
...@@ -66,6 +66,9 @@ ...@@ -66,6 +66,9 @@
#ifndef FF_API_ALLOC_FORMAT_CONTEXT #ifndef FF_API_ALLOC_FORMAT_CONTEXT
#define FF_API_ALLOC_FORMAT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_ALLOC_FORMAT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #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 * I return the LIBAVFORMAT_VERSION_INT constant. You got
...@@ -1425,7 +1428,7 @@ void dump_format(AVFormatContext *ic, ...@@ -1425,7 +1428,7 @@ void dump_format(AVFormatContext *ic,
const char *url, const char *url,
int is_output); int is_output);
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if FF_API_PARSE_FRAME_PARAM
/** /**
* Parse width and height out of string str. * Parse width and height out of string str.
* @deprecated Use av_parse_video_frame_size instead. * @deprecated Use av_parse_video_frame_size instead.
......
...@@ -3207,7 +3207,7 @@ void dump_format(AVFormatContext *ic, ...@@ -3207,7 +3207,7 @@ void dump_format(AVFormatContext *ic,
av_free(printed); av_free(printed);
} }
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if FF_API_PARSE_FRAME_PARAM
#include "libavcore/parseutils.h" #include "libavcore/parseutils.h"
int parse_image_size(int *width_ptr, int *height_ptr, const char *str) int parse_image_size(int *width_ptr, int *height_ptr, const char *str)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment