diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 12:06:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 12:36:11 +0200 |
| commit | b26ccf218d933660c551832b4b14976b2acb3f0c (patch) | |
| tree | 149a7c27caf046cc105156d9e481cd7af651a90c /libavcodec/version.h | |
| parent | ac2fc63ac6f938a4c995d87486013baffb5ca18a (diff) | |
| parent | c4bfa098072ba338d83555d6e2199f7e1e64ffff (diff) | |
| download | ffmpeg-b26ccf218d933660c551832b4b14976b2acb3f0c.tar.gz | |
Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff':
Add a WebP decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/version.h
libavformat/img2.c
The previously existing webp decoder is disabled as the new
one supports lossless mode and alpha while the previous does not.
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 f16db2aa5a..55065c3ca7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 31 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 32 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |