diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-05-09 22:42:18 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-05-09 22:42:18 +0400 |
| commit | 58b8f3dca465f66372d7354e251c1468bc81d29f (patch) | |
| tree | 5552863db2dd0f16a2412cb9d8b69269ec28f01a | |
| parent | 217211288488c8538c04f43aac5ddd58f177865f (diff) | |
Add more known JPEG2000 FourCCs
| -rw-r--r-- | common/includes/moreuuids.h | 16 | ||||
| -rw-r--r-- | decoder/LAVVideo/Media.cpp | 8 |
2 files changed, 24 insertions, 0 deletions
diff --git a/common/includes/moreuuids.h b/common/includes/moreuuids.h index 831fc2be..be0cf542 100644 --- a/common/includes/moreuuids.h +++ b/common/includes/moreuuids.h @@ -1342,6 +1342,22 @@ DEFINE_GUID(MEDIASUBTYPE_AVdn, DEFINE_GUID(MEDIASUBTYPE_mjp2, 0x32706A6D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +// {43324A4D-0000-0010-8000-00AA00389B71} +DEFINE_GUID(MEDIASUBTYPE_MJ2C, + 0x43324A4D, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); + +// {43324A4C-0000-0010-8000-00AA00389B71} +DEFINE_GUID(MEDIASUBTYPE_LJ2C, + 0x43324A4C, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); + +// {4B324A4C-0000-0010-8000-00AA00389B71} +DEFINE_GUID(MEDIASUBTYPE_LJ2K, + 0x4B324A4C, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); + +// {324A5049-0000-0010-8000-00AA00389B71} +DEFINE_GUID(MEDIASUBTYPE_IPJ2, + 0x324A5049, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); + // {D80FA03C-35C1-4FA1-8C8E-375C8667166E} DEFINE_GUID(MEDIASUBTYPE_LAV_RAWVIDEO, 0xd80fa03c, 0x35c1, 0x4fa1, 0x8c, 0x8e, 0x37, 0x5c, 0x86, 0x67, 0x16, 0x6e); diff --git a/decoder/LAVVideo/Media.cpp b/decoder/LAVVideo/Media.cpp index 31f07b56..db8af793 100644 --- a/decoder/LAVVideo/Media.cpp +++ b/decoder/LAVVideo/Media.cpp @@ -168,6 +168,10 @@ static const FFMPEG_SUBTYPE_MAP lavc_video_codecs[] = { // JPEG 2000 { &MEDIASUBTYPE_mjp2, AV_CODEC_ID_JPEG2000 }, + { &MEDIASUBTYPE_MJ2C, AV_CODEC_ID_JPEG2000 }, + { &MEDIASUBTYPE_LJ2C, AV_CODEC_ID_JPEG2000 }, + { &MEDIASUBTYPE_LJ2K, AV_CODEC_ID_JPEG2000 }, + { &MEDIASUBTYPE_IPJ2, AV_CODEC_ID_JPEG2000 }, // Misc Formats { &MEDIASUBTYPE_SVQ1, AV_CODEC_ID_SVQ1 }, @@ -390,6 +394,10 @@ const AMOVIESETUP_MEDIATYPE CLAVVideo::sudPinTypesIn[] = { // JPEG 2000 { &MEDIATYPE_Video, &MEDIASUBTYPE_mjp2 }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_MJ2C }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_LJ2C }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_LJ2K }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_IPJ2 }, // Misc Formats { &MEDIATYPE_Video, &MEDIASUBTYPE_SVQ1 }, |