diff options
| author | Underground78 <underground78@users.sourceforge.net> | 2013-05-25 14:12:40 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-05-25 17:21:55 +0400 |
| commit | 4280c3f23328c259fb0c7d9e5604e5bc59da0f17 (patch) | |
| tree | bb80018e36a3035f5dfe6314dd0c93ef744e1c16 /decoder | |
| parent | de80953667abbfa39600814385f710428c70f983 (diff) | |
Support for FLIC
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
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 816865eb..aa5ef92b 100644 --- a/decoder/LAVVideo/LAVVideoSettings.h +++ b/decoder/LAVVideo/LAVVideoSettings.h @@ -79,6 +79,7 @@ typedef enum LAVVideoCodec { Codec_v210, Codec_JPEG2000, Codec_VMNC, + Codec_FLIC, Codec_VideoNB // Number of entrys (do not use when dynamically linking) }; diff --git a/decoder/LAVVideo/Media.cpp b/decoder/LAVVideo/Media.cpp index 9aac539d..405c502c 100644 --- a/decoder/LAVVideo/Media.cpp +++ b/decoder/LAVVideo/Media.cpp @@ -233,6 +233,7 @@ static const FFMPEG_SUBTYPE_MAP lavc_video_codecs[] = { { &MEDIASUBTYPE_FFV1, AV_CODEC_ID_FFV1 }, { &MEDIASUBTYPE_FFVH, AV_CODEC_ID_FFVHUFF }, { &MEDIASUBTYPE_VMNC, AV_CODEC_ID_VMNC }, + { &MEDIASUBTYPE_FLIC, AV_CODEC_ID_FLIC }, // Game Formats { &MEDIASUBTYPE_BIKI, AV_CODEC_ID_BINKVIDEO }, @@ -460,6 +461,7 @@ const AMOVIESETUP_MEDIATYPE CLAVVideo::sudPinTypesIn[] = { { &MEDIATYPE_Video, &MEDIASUBTYPE_FFV1 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_FFVH }, { &MEDIATYPE_Video, &MEDIASUBTYPE_VMNC }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_FLIC }, // Game Formats { &MEDIATYPE_Video, &MEDIASUBTYPE_BIKI }, @@ -556,6 +558,7 @@ static codec_config_t m_codec_config[] = { { 2, { AV_CODEC_ID_V210, AV_CODEC_ID_V410 }, "v210/v410", "v210/v410 uncompressed"}, // Codec_v210 { 1, { AV_CODEC_ID_JPEG2000 }}, // Codec_JPEG2000 { 1, { AV_CODEC_ID_VMNC }}, // Codec_VMNC + { 1, { AV_CODEC_ID_FLIC }}, // Codec_FLIC }; const codec_config_t *get_codec_config(LAVVideoCodec codec) |