diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 21:44:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-15 22:18:41 +0100 |
| commit | 209001073adf190ccf2e578f25d4b3d41b1640a0 (patch) | |
| tree | 11d04d4bd1eb083cfe3019bddd5e99587026fef7 /libavcodec/version.h | |
| parent | e46a7fdc8748c286e391c1e7f2921d98a4486681 (diff) | |
| parent | 217e4ff4d1f845b76e44634e29371cd09313d1c2 (diff) | |
| download | ffmpeg-209001073adf190ccf2e578f25d4b3d41b1640a0.tar.gz | |
Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'
* commit '217e4ff4d1f845b76e44634e29371cd09313d1c2':
dca: Support for XLL (lossless extension)
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/dca.h
libavcodec/dca_exss.c
libavcodec/dcadata.h
libavcodec/dcadec.c
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 4f0dc21b58..1ffe016e69 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 27 +#define LIBAVCODEC_VERSION_MINOR 28 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |