projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae58466
)
riff: add escape130 FourCC
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 3 Apr 2014 14:12:55 +0000
(16:12 +0200)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Thu, 3 Apr 2014 23:29:27 +0000
(
01:29
+0200)
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
9013692
..
b33c31e
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-329,6
+329,7
@@
const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'H', '0') },
{ AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'H', '2') },
{ AV_CODEC_ID_VBLE, MKTAG('V', 'B', 'L', 'E') },
+ { AV_CODEC_ID_ESCAPE130, MKTAG('E', '1', '3', '0') },
{ AV_CODEC_ID_DXTORY, MKTAG('x', 't', 'o', 'r') },
{ AV_CODEC_ID_ZEROCODEC, MKTAG('Z', 'E', 'C', 'O') },
{ AV_CODEC_ID_MSS1, MKTAG('M', 'S', 'S', '1') },