RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add FF_API_ALLOC_FORMAT_CONTEXT define to disable the deprecated 

av_alloc_format_context() public function

Originally committed as revision 25483 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-10-15 12:59:45 +00:00
parent 88e44314ea
commit ca51d86c96
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

@ -63,6 +63,9 @@
#ifndef FF_API_URL_SPLIT #ifndef FF_API_URL_SPLIT
#define FF_API_URL_SPLIT (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_URL_SPLIT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #endif
#ifndef FF_API_ALLOC_FORMAT_CONTEXT
#define FF_API_ALLOC_FORMAT_CONTEXT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
/** /**
* I return the LIBAVFORMAT_VERSION_INT constant. You got * I return the LIBAVFORMAT_VERSION_INT constant. You got
@ -1071,7 +1074,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
int buf_size, int buf_size,
AVFormatParameters *ap); AVFormatParameters *ap);
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if FF_API_ALLOC_FORMAT_CONTEXT
/** /**
* @deprecated Use avformat_alloc_context() instead. * @deprecated Use avformat_alloc_context() instead.
*/ */

2
libavformat/options.c
View File

@ -89,7 +89,7 @@ AVFormatContext *avformat_alloc_context(void)
return ic; return ic;
} }
#if LIBAVFORMAT_VERSION_MAJOR < 53 #if FF_API_ALLOC_FORMAT_CONTEXT
AVFormatContext *av_alloc_format_context(void) AVFormatContext *av_alloc_format_context(void)
{ {
return avformat_alloc_context(); return avformat_alloc_context();