Browse code

Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'

* commit 'add3a6902ea4d459f36655656a1f8daa409118a7':
lavu: bump major to 52

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2012/10/23 20:13:18
Showing 2 changed files
... ...
@@ -10,7 +10,7 @@ libavresample: 2012-10-05
10 10
 libpostproc:   2011-04-18
11 11
 libswresample: 2011-09-19
12 12
 libswscale:    2011-06-20
13
-libavutil:     2011-04-18
13
+libavutil:     2012-10-22
14 14
 
15 15
 
16 16
 API changes, most recent first:
... ...
@@ -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)