videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

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
This commit is contained in:
Aurelien Jacobs 2010-10-15 13:33:23 +00:00
parent ade800c5b7
commit d87a521cde
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avformat.h
View File

@ -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.

2
libavformat/utils.c
View File

@ -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)