diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 21:06:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-03 21:06:46 +0200 |
| commit | d563e13a7c7daa03c89636f85305e1839bcb27be (patch) | |
| tree | 0bb0339665aa0d1a0f8b439b64b71b9f8d5a57b7 | |
| parent | 866404df2d4690e0e0958d48754debc812fec5af (diff) | |
| parent | 832129431fd5c693b12c32a1563944c631feaf36 (diff) | |
| download | ffmpeg-d563e13a7c7daa03c89636f85305e1839bcb27be.tar.gz | |
Merge commit '832129431fd5c693b12c32a1563944c631feaf36'
* commit '832129431fd5c693b12c32a1563944c631feaf36':
lavu: Add version information for av_version_info()
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/APIchanges | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index bae223111c..12d607d03c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -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< --------- diff --git a/libavutil/version.h b/libavutil/version.h index 215729ec18..e7155c2609 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -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, \ |