Commit d563e13a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '83212943'

* commit '83212943':
  lavu: Add version information for av_version_info()

Conflicts:
	doc/APIchanges
	libavutil/version.h
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 866404df 83212943
...@@ -15,7 +15,7 @@ libavutil: 2014-08-09 ...@@ -15,7 +15,7 @@ libavutil: 2014-08-09
API changes, most recent first: 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(). Add av_version_info().
-------- 8< --------- FFmpeg 2.7 was cut here -------- 8< --------- -------- 8< --------- FFmpeg 2.7 was cut here -------- 8< ---------
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
*/ */
#define LIBAVUTIL_VERSION_MAJOR 54 #define LIBAVUTIL_VERSION_MAJOR 54
#define LIBAVUTIL_VERSION_MINOR 27 #define LIBAVUTIL_VERSION_MINOR 28
#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment