summaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-06-26 14:41:05 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2016-06-26 14:41:05 +0200
commit46ff31d39c2e3dcb5237ecfac45316c0d13a57ed (patch)
treee67478d22560b7ce2cc3834fd3cf461afcc8e223 /libavcodec/avcodec.h
parent7c6ae9ca0489aa3f355973f66ed7c28097ff6126 (diff)
parentad61da054bd8c74a5d5b38d80846228fc6147108 (diff)
downloadffmpeg-streaming-46ff31d39c2e3dcb5237ecfac45316c0d13a57ed.zip
ffmpeg-streaming-46ff31d39c2e3dcb5237ecfac45316c0d13a57ed.tar.gz
Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'
* commit 'ad61da054bd8c74a5d5b38d80846228fc6147108': jpeg2000: Fix profile define values Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index efd386a..39713ed 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3218,9 +3218,9 @@ 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_CSTREAM_RESTRICTION_0 1
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 2
+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 32768
#define FF_PROFILE_JPEG2000_DCINEMA_2K 3
#define FF_PROFILE_JPEG2000_DCINEMA_4K 4
OpenPOWER on IntegriCloud