Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavf: remove FF_API_FIRST_FORMAT cruft

Browse source
This commit is contained in:
Anton Khirnov 2011-02-03 12:47:18 +01:00
parent 583f6c67b6
commit b4c5acabb9
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libavformat/avformat.h
View file

@ -820,11 +820,6 @@ typedef struct AVPacketList {
struct AVPacketList *next; struct AVPacketList *next;
} AVPacketList; } AVPacketList;
#if FF_API_FIRST_FORMAT
attribute_deprecated extern AVInputFormat *first_iformat;
attribute_deprecated extern AVOutputFormat *first_oformat;
#endif
/** /**
* If f is NULL, returns the first registered input format, * If f is NULL, returns the first registered input format,
* if f is non-NULL, returns the next registered input format after f * if f is non-NULL, returns the next registered input format after f

10
libavformat/utils.c
View file

@ -115,15 +115,9 @@ 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 AVInputFormat *first_iformat = NULL;
static
#endif
AVInputFormat *first_iformat = NULL;
/** head of registered output format linked list */ /** head of registered output format linked list */
#if !FF_API_FIRST_FORMAT static AVOutputFormat *first_oformat = NULL;
static
#endif
AVOutputFormat *first_oformat = NULL;
AVInputFormat *av_iformat_next(AVInputFormat *f) AVInputFormat *av_iformat_next(AVInputFormat *f)
{ {

3
libavformat/version.h
View file

@ -50,9 +50,6 @@
#ifndef FF_API_READ_SEEK #ifndef FF_API_READ_SEEK
#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54) #define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54)
#endif #endif
#ifndef FF_API_FIRST_FORMAT
#define FF_API_FIRST_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_SYMVER #ifndef FF_API_SYMVER
#define FF_API_SYMVER (LIBAVFORMAT_VERSION_MAJOR < 53) #define FF_API_SYMVER (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif #endif