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/avcodec.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/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index aba3aea0c1..e5b0c2b176 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2719,6 +2719,12 @@ typedef struct AVCodecContext { #define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14 #define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15 +#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 0 +#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 1 +#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 2 +#define FF_PROFILE_JPEG2000_DCINEMA_2K 3 +#define FF_PROFILE_JPEG2000_DCINEMA_4K 4 + /** * level * - encoding: Set by user. |