diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 19:41:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 20:00:54 +0200 |
commit | e2e9bee2daef9d5d5169f5360737eec8b76d7e0c (patch) | |
tree | 22ba6e50d34a036832d4ef8f903df335d3c9d63a /libavcodec/version.h | |
parent | c1c2b0b3390482bba39534f2f125d97e8964d7d5 (diff) | |
parent | f13888afcc5e528b80e4ae5bc4f0d9dadc76f6aa (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: Bump minor for JPEG 2000 decoder
JPEG 2000 decoder for DCinema
The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/mqc.c
libavcodec/mqc.h
libavcodec/mqcdec.c
libavcodec/version.h
tests/fate/video.mak
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 b1918f18de..d6f7b8eb2b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 5 +#define LIBAVCODEC_VERSION_MINOR 6 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |