diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 13:58:44 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 13:58:44 +0100 |
| commit | 8b3228a329bb38671aee9c4434f2989d149732fe (patch) | |
| tree | e6e60e471a3ff518e7b3d71f63197d44349ce768 /libavformat | |
| parent | 8dde5dc05ae2fc4d4a5adc0a718631673b2af0f7 (diff) | |
| parent | 533a6198505edd1379e1cd722852350ae4a85acc (diff) | |
Merge commit '533a6198505edd1379e1cd722852350ae4a85acc'
* commit '533a6198505edd1379e1cd722852350ae4a85acc':
innoHeim/Rsupport Screen Capture Codec decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index a9197e76a3..3eec611b1e 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -375,6 +375,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_HQ_HQA, MKTAG('C', 'U', 'V', 'C') }, { AV_CODEC_ID_RV40, MKTAG('R', 'V', '4', '0') }, { AV_CODEC_ID_SCREENPRESSO, MKTAG('S', 'P', 'V', '1') }, + { AV_CODEC_ID_RSCC, MKTAG('R', 'S', 'C', 'C') }, + { AV_CODEC_ID_RSCC, MKTAG('I', 'S', 'C', 'C') }, { AV_CODEC_ID_NONE, 0 } }; |