diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-12 14:49:06 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-12 14:49:06 +0300 |
| commit | 7190a201b7380fc106b9d34915f50044e8d08d95 (patch) | |
| tree | 97a72f1cced9701ab987109f38ec3d9d7b8cc70b /decoder | |
| parent | 3e97cb59ecb0f486fbab572fbf7e1f4066efdba3 (diff) | |
Add support for MagicYUV decoding
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 7730e777..4cc96957 100644 --- a/decoder/LAVVideo/LAVVideoSettings.h +++ b/decoder/LAVVideo/LAVVideoSettings.h @@ -89,6 +89,7 @@ typedef enum LAVVideoCodec { Codec_VP7, Codec_H264MVC, Codec_CineformHD, + Codec_MagicYUV, Codec_VideoNB // Number of entries (do not use when dynamically linking) } LAVVideoCodec; diff --git a/decoder/LAVVideo/Media.cpp b/decoder/LAVVideo/Media.cpp index 4b7c4428..1f26f3b2 100644 --- a/decoder/LAVVideo/Media.cpp +++ b/decoder/LAVVideo/Media.cpp @@ -266,6 +266,7 @@ static const FFMPEG_SUBTYPE_MAP lavc_video_codecs[] = { { &MEDIASUBTYPE_DUCK, AV_CODEC_ID_TRUEMOTION1 }, { &MEDIASUBTYPE_TM20, AV_CODEC_ID_TRUEMOTION2 }, { &MEDIASUBTYPE_CFHD, AV_CODEC_ID_CFHD }, + { &MEDIASUBTYPE_MAGY, AV_CODEC_ID_MAGICYUV }, // Game Formats { &MEDIASUBTYPE_BIKI, AV_CODEC_ID_BINKVIDEO }, @@ -526,6 +527,7 @@ const AMOVIESETUP_MEDIATYPE CLAVVideo::sudPinTypesIn[] = { { &MEDIATYPE_Video, &MEDIASUBTYPE_DUCK }, { &MEDIATYPE_Video, &MEDIASUBTYPE_TM20 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_CFHD }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_MAGY }, // Game Formats { &MEDIATYPE_Video, &MEDIASUBTYPE_BIKI }, @@ -633,6 +635,7 @@ static codec_config_t m_codec_config[] = { { 1, { AV_CODEC_ID_VP7 }}, // Codec_VP7 { 1, { AV_CODEC_ID_H264_MVC }, "h264mvc", "H.264 MVC 3D" }, // Codec_H264MVC { 1, { AV_CODEC_ID_CFHD }, "cfhd", "Cineform HD (experimental)" }, // Codec_CineformHD + { 1, { AV_CODEC_ID_MAGICYUV }}, // Codec_MagicYUV }; const codec_config_t *get_codec_config(LAVVideoCodec codec) |