Browse Source

lavf: remove FF_API_FIRST_FORMAT cruft

tags/n0.8
Anton Khirnov 14 years ago
parent
commit
b4c5acabb9
3 changed files with 2 additions and 16 deletions
  1. +0
    -5
      libavformat/avformat.h
  2. +2
    -8
      libavformat/utils.c
  3. +0
    -3
      libavformat/version.h

+ 0
- 5
libavformat/avformat.h View File

@@ -820,11 +820,6 @@ typedef struct AVPacketList {
struct AVPacketList *next;
} 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 non-NULL, returns the next registered input format after f


+ 2
- 8
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 */
#if !FF_API_FIRST_FORMAT
static
#endif
AVInputFormat *first_iformat = NULL;
static AVInputFormat *first_iformat = NULL;
/** head of registered output format linked list */
#if !FF_API_FIRST_FORMAT
static
#endif
AVOutputFormat *first_oformat = NULL;
static AVOutputFormat *first_oformat = NULL;

AVInputFormat *av_iformat_next(AVInputFormat *f)
{


+ 0
- 3
libavformat/version.h View File

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


Loading…
Cancel
Save