diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 17:58:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-17 17:58:53 +0100 |
| commit | 47cc6168649485837b1e4fdd5f33f16c275933bd (patch) | |
| tree | 2b79b9d31fc0bb8cece748cb595564bc1eb13cfe /libavcodec/version.h | |
| parent | c90f31146e8b1407a4a5808d0d904d85baeed5d4 (diff) | |
| parent | 6fd99e78def3c795bdd0bc31f3ae0998d24bc94c (diff) | |
| download | ffmpeg-47cc6168649485837b1e4fdd5f33f16c275933bd.tar.gz | |
Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'
* commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c':
png: add a standalone parser
Conflicts:
Changelog
libavcodec/png_parser.c
libavcodec/version.h
See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
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 1beb01cc39..981ae4fb89 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 45 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |