| ... | ... |
@@ -820,11 +820,6 @@ typedef struct AVPacketList {
|
| 820 | 820 |
struct AVPacketList *next; |
| 821 | 821 |
} AVPacketList; |
| 822 | 822 |
|
| 823 |
-#if FF_API_FIRST_FORMAT |
|
| 824 |
-attribute_deprecated extern AVInputFormat *first_iformat; |
|
| 825 |
-attribute_deprecated extern AVOutputFormat *first_oformat; |
|
| 826 |
-#endif |
|
| 827 |
- |
|
| 828 | 823 |
/** |
| 829 | 824 |
* If f is NULL, returns the first registered input format, |
| 830 | 825 |
* if f is non-NULL, returns the next registered input format after f |
| ... | ... |
@@ -115,15 +115,9 @@ static void av_frac_add(AVFrac *f, int64_t incr) |
| 115 | 115 |
} |
| 116 | 116 |
|
| 117 | 117 |
/** head of registered input format linked list */ |
| 118 |
-#if !FF_API_FIRST_FORMAT |
|
| 119 |
-static |
|
| 120 |
-#endif |
|
| 121 |
-AVInputFormat *first_iformat = NULL; |
|
| 118 |
+static AVInputFormat *first_iformat = NULL; |
|
| 122 | 119 |
/** head of registered output format linked list */ |
| 123 |
-#if !FF_API_FIRST_FORMAT |
|
| 124 |
-static |
|
| 125 |
-#endif |
|
| 126 |
-AVOutputFormat *first_oformat = NULL; |
|
| 120 |
+static AVOutputFormat *first_oformat = NULL; |
|
| 127 | 121 |
|
| 128 | 122 |
AVInputFormat *av_iformat_next(AVInputFormat *f) |
| 129 | 123 |
{
|
| ... | ... |
@@ -50,9 +50,6 @@ |
| 50 | 50 |
#ifndef FF_API_READ_SEEK |
| 51 | 51 |
#define FF_API_READ_SEEK (LIBAVFORMAT_VERSION_MAJOR < 54) |
| 52 | 52 |
#endif |
| 53 |
-#ifndef FF_API_FIRST_FORMAT |
|
| 54 |
-#define FF_API_FIRST_FORMAT (LIBAVFORMAT_VERSION_MAJOR < 53) |
|
| 55 |
-#endif |
|
| 56 | 53 |
#ifndef FF_API_SYMVER |
| 57 | 54 |
#define FF_API_SYMVER (LIBAVFORMAT_VERSION_MAJOR < 53) |
| 58 | 55 |
#endif |