diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:34:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 22:42:49 +0200 |
| commit | cc48409b51c8cd8fed8038c00ea8b4a6b2341004 (patch) | |
| tree | 5930e10fb3a32b0464962e222c816f16969bb2ed /libavcodec/version.h | |
| parent | a3adba358bbb3e8f953b15ad2820a3ff996ef91b (diff) | |
| parent | e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623 (diff) | |
Merge commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623'
* commit 'e7c5e17d4fbd7c83fb331bf327e25ebd8e6a8623':
vda: Make output CVPixelBuffer format configurable
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 1d0525aa18..8679ac6766 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 38 +#define LIBAVCODEC_VERSION_MINOR 39 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |