diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:13:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 03:19:23 +0100 |
| commit | 9aabe6678147d947ce7a32bf9bb1e087fac7fdde (patch) | |
| tree | 519b7d12aebdc9027f8ee4b412203abfdb97907e /libavcodec/version.h | |
| parent | c8e05c438f78ac5fee40f260a7f822f5a81b44e0 (diff) | |
| parent | 3a3790b8f8b56ee6abc93ccac280eb693675e294 (diff) | |
| download | ffmpeg-9aabe6678147d947ce7a32bf9bb1e087fac7fdde.tar.gz | |
Merge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'
* commit '3a3790b8f8b56ee6abc93ccac280eb693675e294':
tiff: support encoding and decoding 64bit images
Conflicts:
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/version.h
See: c714cd3bd4af70e0cba1db399ca420b1f51a773d
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 6610e8ca13..75e3da49fd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MINOR 15 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |