diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-05-10 11:53:32 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-05-10 11:55:47 +0400 |
| commit | 64fee351645ccae70bb387ec6cc52368d4895f69 (patch) | |
| tree | 2c3527444f4782d2f4f78f1bc3bc99ed7d9aef20 /decoder | |
| parent | ddc6482826488305839ed5463707b8861cef55b1 (diff) | |
Add FourCC for VMWare video codec (VMnc)
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/LAVVideo/LAVVideoSettings.h | 1 | ||||
| -rw-r--r-- | decoder/LAVVideo/Media.cpp | 3 |
2 files changed, 4 insertions, 0 deletions
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) |