summaryrefslogtreecommitdiff
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorEric Zimmerman <eric@zimtek.com>2014-10-09 10:12:44 -0700
committerMichael Niedermayer <michaelni@gmx.at>2014-10-24 19:36:09 +0200
commit4ba5420e4d3699b89c9f7f15928cd486f88e9562 (patch)
tree41914667254e1abf0ff4116f2f5a77aa7ae28c93 /libavformat/riff.c
parent4641ae352ec587355764ffd5c43dd0d0ebd47654 (diff)
Added support for G2M5 codec
This has also been independently found and fixed similarly by carl in f4a3bbf4a3cd375121ea2495817f3e50e831ed48 The 2nd magic check is taken from carls implementation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 99fee626fa..c63e406be4 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -360,6 +360,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '2') },
{ AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '3') },
{ AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') },
+ { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '5') },
{ AV_CODEC_ID_FIC, MKTAG('F', 'I', 'C', 'V') },
{ AV_CODEC_ID_NONE, 0 }
};