diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 12:22:41 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 12:22:41 +0200 |
| commit | 4d2160c99a00af98cb09749f24831580e816eda9 (patch) | |
| tree | cf897382bd18d139b6533f2fd889e25eee6eafbd /libavformat/riff.c | |
| parent | 9825a24e5b1c34663d672961ebd2561a009b23e9 (diff) | |
| parent | 9a3202a98b2e095b54dd784c3e01a09a676fc3fa (diff) | |
| download | ffmpeg-4d2160c99a00af98cb09749f24831580e816eda9.tar.gz | |
Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'
* commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa':
Screenpresso SPV1 decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index be76b0aa3d..a9197e76a3 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -374,6 +374,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_TDSC, MKTAG('T', 'D', 'S', 'C') }, { 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_NONE, 0 } }; |