diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 11:53:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 11:53:41 +0100 |
| commit | 6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd (patch) | |
| tree | 6d894ef0fb24a5394ce4341e2404d6668f8d23f1 /libavcodec/version.h | |
| parent | 9b195dd5793edb88a72d53cb080c2216e91a5849 (diff) | |
| parent | be7c323176e2e5fcf30e3d2ff20975b2f936811b (diff) | |
| download | ffmpeg-6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd.tar.gz | |
Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'
* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
Add a libwebp encoder
Conflicts:
Changelog
doc/encoders.texi
doc/general.texi
libavcodec/version.h
libavformat/img2enc.c
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 1993fa60c0..0d75976bd6 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 45 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MINOR 46 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |