generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add FF_API_FIRST_FORMAT define to drop deprecated first_?format from public api

Browse Source 
Originally committed as revision 25489 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-10-15 14:25:36 +00:00
parent 0139fdea08
commit 114c9a5925
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avformat.h
View File

@ -78,6 +78,9 @@
#ifndef FF_API_PARAMETERS_CODEC_ID #ifndef FF_API_PARAMETERS_CODEC_ID
#define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #endif
#ifndef FF_API_FIRST_FORMAT
#define FF_API_FIRST_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
/** /**
* I return the LIBAVFORMAT_VERSION_INT constant. You got * I return the LIBAVFORMAT_VERSION_INT constant. You got
@ -895,7 +898,7 @@ typedef struct AVPacketList {
struct AVPacketList *next; struct AVPacketList *next;
} AVPacketList; } AVPacketList;
#if LIBAVFORMAT_VERSION_INT < (53<<16) #if FF_API_FIRST_FORMAT
attribute_deprecated extern AVInputFormat *first_iformat; attribute_deprecated extern AVInputFormat *first_iformat;
attribute_deprecated extern AVOutputFormat *first_oformat; attribute_deprecated extern AVOutputFormat *first_oformat;
#endif #endif

6
libavformat/utils.c
View File

@ -110,8 +110,14 @@ static void av_frac_add(AVFrac *f, int64_t incr)
} }
/** head of registered input format linked list */ /** head of registered input format linked list */
#if !FF_API_FIRST_FORMAT
static
#endif
AVInputFormat *first_iformat = NULL; AVInputFormat *first_iformat = NULL;
/** head of registered output format linked list */ /** head of registered output format linked list */
#if !FF_API_FIRST_FORMAT
static
#endif
AVOutputFormat *first_oformat = NULL; AVOutputFormat *first_oformat = NULL;
AVInputFormat *av_iformat_next(AVInputFormat *f) AVInputFormat *av_iformat_next(AVInputFormat *f)