* commit 'add3a6902ea4d459f36655656a1f8daa409118a7':
lavu: bump major to 52
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
... | ... |
@@ -74,8 +74,8 @@ |
74 | 74 |
* @{ |
75 | 75 |
*/ |
76 | 76 |
|
77 |
-#define LIBAVUTIL_VERSION_MAJOR 51 |
|
78 |
-#define LIBAVUTIL_VERSION_MINOR 77 |
|
77 |
+#define LIBAVUTIL_VERSION_MAJOR 52 |
|
78 |
+#define LIBAVUTIL_VERSION_MINOR 0 |
|
79 | 79 |
#define LIBAVUTIL_VERSION_MICRO 100 |
80 | 80 |
|
81 | 81 |
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |
... | ... |
@@ -112,7 +112,7 @@ |
112 | 112 |
#define FF_API_AV_FIFO_PEEK (LIBAVUTIL_VERSION_MAJOR < 52) |
113 | 113 |
#endif |
114 | 114 |
#ifndef FF_API_OLD_AVOPTIONS |
115 |
-#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 52) |
|
115 |
+#define FF_API_OLD_AVOPTIONS (LIBAVUTIL_VERSION_MAJOR < 53) |
|
116 | 116 |
#endif |
117 | 117 |
#ifndef FF_API_OLD_TC_ADJUST_FRAMENUM |
118 | 118 |
#define FF_API_OLD_TC_ADJUST_FRAMENUM (LIBAVUTIL_VERSION_MAJOR < 52) |