diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-10-25 20:03:49 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-10-25 20:03:49 +0400 |
| commit | ecf4e867b8222cf6e381141b8771e74a062781b9 (patch) | |
| tree | eaf836a1581d43ad4ffa5e51e8e46e81d5554ce8 /decoder/LAVVideo | |
| parent | 6d90a8dd283b1aa1e8cff9f6d31bf0b36e99be05 (diff) | |
Properly map PNG and TIFF images
Diffstat (limited to 'decoder/LAVVideo')
| -rw-r--r-- | decoder/LAVVideo/Media.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/decoder/LAVVideo/Media.cpp b/decoder/LAVVideo/Media.cpp index 737d2f58..eab8ce91 100644 --- a/decoder/LAVVideo/Media.cpp +++ b/decoder/LAVVideo/Media.cpp @@ -177,7 +177,6 @@ static const FFMPEG_SUBTYPE_MAP lavc_video_codecs[] = { { &MEDIASUBTYPE_MSZH, AV_CODEC_ID_MSZH }, { &MEDIASUBTYPE_ZLIB, AV_CODEC_ID_ZLIB }, { &MEDIASUBTYPE_QTRpza, AV_CODEC_ID_RPZA }, - { &MEDIASUBTYPE_PNG, AV_CODEC_ID_PNG }, { &MEDIASUBTYPE_PCM, AV_CODEC_ID_MSRLE }, // Yeah, PCM. Its the same FourCC as used by MS-RLE { &MEDIASUBTYPE_apch, AV_CODEC_ID_PRORES }, { &MEDIASUBTYPE_apcn, AV_CODEC_ID_PRORES }, @@ -211,6 +210,10 @@ static const FFMPEG_SUBTYPE_MAP lavc_video_codecs[] = { { &MEDIASUBTYPE_SMK2, AV_CODEC_ID_SMACKVIDEO }, { &MEDIASUBTYPE_SMK4, AV_CODEC_ID_SMACKVIDEO }, + // Image Formats + { &MEDIASUBTYPE_PNG, AV_CODEC_ID_PNG }, + { &MEDIASUBTYPE_TIFF, AV_CODEC_ID_TIFF }, + // Special raw formats { &MEDIASUBTYPE_v210, AV_CODEC_ID_V210 }, { &MEDIASUBTYPE_v410, AV_CODEC_ID_V410 }, @@ -368,7 +371,6 @@ const AMOVIESETUP_MEDIATYPE CLAVVideo::sudPinTypesIn[] = { { &MEDIATYPE_Video, &MEDIASUBTYPE_MSZH }, { &MEDIATYPE_Video, &MEDIASUBTYPE_ZLIB }, { &MEDIATYPE_Video, &MEDIASUBTYPE_QTRpza }, - { &MEDIATYPE_Video, &MEDIASUBTYPE_PNG }, { &MEDIATYPE_Video, &MEDIASUBTYPE_PCM }, // Yeah, PCM. Its the same FourCC as used by MS-RLE { &MEDIATYPE_Video, &MEDIASUBTYPE_apch }, { &MEDIATYPE_Video, &MEDIASUBTYPE_apcn }, @@ -402,6 +404,10 @@ const AMOVIESETUP_MEDIATYPE CLAVVideo::sudPinTypesIn[] = { { &MEDIATYPE_Video, &MEDIASUBTYPE_SMK2 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_SMK4 }, + // Image Formats + { &MEDIATYPE_Video, &MEDIASUBTYPE_PNG }, + { &MEDIATYPE_Video, &MEDIASUBTYPE_TIFF }, + // Special raw formats { &MEDIATYPE_Video, &MEDIASUBTYPE_v210 }, { &MEDIATYPE_Video, &MEDIASUBTYPE_v410 }, |