diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 14:50:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 18:20:17 +0200 |
| commit | 2c7d3ecfc962fe2d2afa84cd347136060468fe0e (patch) | |
| tree | c41ba636d60abccf4acaab315de41823967a033e /libavcodec/version.h | |
| parent | 8b96f31817be57f0542834e7d6bdaecf2db6fd50 (diff) | |
| parent | b70d7a4ac72d23f3448f3b08b770fdf5f57de222 (diff) | |
| download | ffmpeg-2c7d3ecfc962fe2d2afa84cd347136060468fe0e.tar.gz | |
Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'
* commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222':
lavc: add a native Opus decoder.
Conflicts:
Changelog
configure
libavcodec/version.h
Fate tests pass with both avresample as well as swresample based opus decoder, but
are disabled (reference files are very large so i want to think a day or 2 about
if theres an alternative or if they could be avoided, they also dont match the
official samples)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index dc9739e57e..680c060325 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 61 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 62 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |