From: Piotr Bandurski <ami_stuff@o2.pl>
Date: Fri, 6 May 2016 20:43:00 +0000 (+0200)
Subject: avformat/riff: add M102 FourCC
X-Git-Tag: android-x86-7.1-r1~5346
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e601e078e94f03d1288daa8516249cc27be688f7;p=android-x86%2Fexternal-ffmpeg.git

avformat/riff: add M102 FourCC

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---

diff --git a/libavformat/riff.c b/libavformat/riff.c
index ccbe608acd..dd20aff280 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -420,6 +420,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { AV_CODEC_ID_RSCC,         MKTAG('I', 'S', 'C', 'C') },
     { AV_CODEC_ID_CFHD,         MKTAG('C', 'F', 'H', 'D') },
     { AV_CODEC_ID_M101,         MKTAG('M', '1', '0', '1') },
+    { AV_CODEC_ID_M101,         MKTAG('M', '1', '0', '2') },
 
     { AV_CODEC_ID_NONE,         0 }
 };