History

Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'

* commit 'ad61da054bd8c74a5d5b38d80846228fc6147108': jpeg2000: Fix profile define values

Hendrik Leppkes committed 10 years ago

Commit 46ff31d2 parents 7c6ae9c ad61da01 file · +3 −3Browse files

Unified · Split

libavcodec/avcodec.h+3−3
@@ -3218,9 +3218,9 @@ typedef struct AVCodecContext { · 3217 unmodified lines
32183218 #define FF_PROFILE_MPEG4_SIMPLE_STUDIO 14
32193219 #define FF_PROFILE_MPEG4_ADVANCED_SIMPLE 15
32203220
3221−#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 0
3222−#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 1
3223−#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 2
3221+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0 1
3222+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1 2
3223+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION 32768
32243224 #define FF_PROFILE_JPEG2000_DCINEMA_2K 3
32253225 #define FF_PROFILE_JPEG2000_DCINEMA_4K 4
32263226

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t