Merge commit '832129431fd5c693b12c32a1563944c631feaf36'

* commit '832129431fd5c693b12c32a1563944c631feaf36': lavu: Add version information for av_version_info() Conflicts: doc/APIchanges libavutil/version.h

Michael Niedermayer committed 11 years ago

Commit d563e132 parents 866404d 83212942 files · +2 −2Browse files

Unified · Split

2 files

doc/APIchanges +1 −1
libavutil/version.h +1 −1

doc/APIchanges+1−1

@@ -15,7 +15,7 @@ libavutil: 2014-08-09 · 14 unmodified lines
15		15
16	API changes, most recent first:	16	API changes, most recent first:
17		17
18	2015-xx-xx - xxxxxxx - lavu 56.xx.0	18	2015-xx-xx - xxxxxxx - lavu 56.15.0
19	Add av_version_info().	19	Add av_version_info().
20		20
21	-------- 8< --------- FFmpeg 2.7 was cut here -------- 8< ---------	21	-------- 8< --------- FFmpeg 2.7 was cut here -------- 8< ---------

libavutil/version.h+1−1

@@ -56,7 +56,7 @@ · 55 unmodified lines
56	*/	56	*/
57		57
58	#define LIBAVUTIL_VERSION_MAJOR 54	58	#define LIBAVUTIL_VERSION_MAJOR 54
59	#define LIBAVUTIL_VERSION_MINOR 27	59	#define LIBAVUTIL_VERSION_MINOR 28
60	#define LIBAVUTIL_VERSION_MICRO 100	60	#define LIBAVUTIL_VERSION_MICRO 100
61		61
62	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	62	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

Merge commit '832129431fd5c693b12c32a1563944c631feaf36'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code