diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-23 12:38:51 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-23 12:38:51 +0200 |
| commit | abb3cc46d595dcb186ae30ec7339a56cd9803f45 (patch) | |
| tree | 6397a8cdb89841f13ef23c8f860fe5eac4c253ec /libavutil/version.h | |
| parent | 5954730ba35ca223e7ba520ade9d589e158c1ede (diff) | |
| parent | 0c4468dc185fa8b9e7d6add914595c5e928b24fd (diff) | |
Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'
* commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd':
stereo3d: Add API to get name from value or value from name
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 588ab5a171..a282fa864d 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -64,7 +64,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 25 +#define LIBAVUTIL_VERSION_MINOR 26 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |