Merge commit '832129431fd5c693b12c32a1563944c631feaf36'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 19:06:23 +0000 (21:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 19:06:46 +0000 (21:06 +0200)
* commit '832129431fd5c693b12c32a1563944c631feaf36':
  lavu: Add version information for av_version_info()

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/version.h

index bae2231..12d607d 100644 (file)
@@ -15,7 +15,7 @@ libavutil:     2014-08-09
 
 API changes, most recent first:
 
-2015-xx-xx - xxxxxxx - lavu 56.xx.0
+2015-xx-xx - xxxxxxx - lavu 56.15.0
   Add av_version_info().
 
 -------- 8< --------- FFmpeg 2.7 was cut here -------- 8< ---------
index 215729e..e7155c2 100644 (file)
@@ -56,7 +56,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  54
-#define LIBAVUTIL_VERSION_MINOR  27
+#define LIBAVUTIL_VERSION_MINOR  28
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \