ffmpeg | branch: master | Hendrik Leppkes <[email protected]> | Sun Jun 26 14:41:05 2016 +0200| [46ff31d39c2e3dcb5237ecfac45316c0d13a57ed] | committer: Hendrik Leppkes
Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108' * commit 'ad61da054bd8c74a5d5b38d80846228fc6147108': jpeg2000: Fix profile define values Merged-by: Hendrik Leppkes <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46ff31d39c2e3dcb5237ecfac45316c0d13a57ed --- libavcodec/avcodec.h | 6 +++--- 1 file 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 ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
