diff options
-rw-r--r-- | common/includes/moreuuids.h | 3 | ||||
-rw-r--r-- | decoder/LAVVideo/LAVVideoSettings.h | 1 | ||||
-rw-r--r-- | decoder/LAVVideo/Media.cpp | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/common/includes/moreuuids.h b/common/includes/moreuuids.h index be0cf542..80ab91fa 100644 --- a/common/includes/moreuuids.h +++ b/common/includes/moreuuids.h @@ -1303,6 +1303,9 @@ DEFINE_GUID(MEDIASUBTYPE_v210, DEFINE_GUID(MEDIASUBTYPE_v410, MAKEFOURCC('v','4','1','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); +DEFINE_GUID(MEDIASUBTYPE_VMNC, + MAKEFOURCC('V','M','n','c'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); + // Apple ProRes DEFINE_GUID(MEDIASUBTYPE_apch, 0x68637061, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71); diff --git a/decoder/LAVVideo/LAVVideoSettings.h b/decoder/LAVVideo/LAVVideoSettings.h index 804d27a3..bcc3de1d 100644 --- a/decoder/LAVVideo/LAVVideoSettings.h +++ b/decoder/LAVVideo/LAVVideoSettings.h @@ -77,6 +77,7 @@ typedef enum LAVVideoCodec { Codec_Snow, Codec_FFV1, Codec_v210, + Codec_VMNC, Codec_VideoNB // Number of entrys (do not use when dynamically linking) }; diff --git a/decoder/LAVVideo/Media.cpp b/decoder/LAVVideo/Media.cpp index db8af793..164b9fd3 100644 --- a/decoder/LAVVideo/Media.cpp +++ b/decoder/LAVVideo/Media.cpp @@ -232,6 +232,7 @@ static const FFMPEG_SUBTYPE_MAP lavc_video_codecs[] = { { &MEDIASUBTYPE_SNOW, AV_CODEC_ID_SNOW }, { &MEDIASUBTYPE_FFV1, AV_CODEC_ID_FFV1 }, { &MEDIASUBTYPE_FFVH, AV_CODEC_ID_FFVHUFF }, + { &MEDIASUBTYPE_VMNC, AV_CODEC_ID_VMNC }, // Game Formats { &MEDIASUBTYPE_BIKI, AV_CODEC_ID_BINKVIDEO }, @@ -458,6 +459,7 @@ const AMOVIESETUP_MEDIATYPE CLAVVideo::sudPinTypesIn[] = { { &MEDIATYPE_Video, &MEDIASUBTYPE_SNOW }, { &MEDIATYPE_Video, &MEDIASUBTYPE_FFV1 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_FFVH }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_VMNC }, // Game Formats { &MEDIATYPE_Video, &MEDIASUBTYPE_BIKI }, @@ -552,6 +554,7 @@ static codec_config_t m_codec_config[] = { { 1, { AV_CODEC_ID_SNOW }}, // Codec_Snow { 1, { AV_CODEC_ID_FFV1 }}, // Codec_FFV1 { 2, { AV_CODEC_ID_V210, AV_CODEC_ID_V410 }, "v210/v410", "v210/v410 uncompressed"}, // Codec_v210 + { 1, { AV_CODEC_ID_VMNC }}, // Codec_VMNC }; const codec_config_t *get_codec_config(LAVVideoCodec codec) |