OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fc68947
)
avformat/riff: add M102 FourCC
author
Piotr Bandurski
<ami_stuff@o2.pl>
Fri, 6 May 2016 20:43:00 +0000
(22:43 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Sat, 7 May 2016 02:42:27 +0000
(
04:42
+0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
ccbe608
..
dd20aff
100644
(file)
--- 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 }
};