OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
17dbe25
)
Add fourcc 0x10000004, seems to actually be MPEG4. Fixes a problematic AVI file.
author
Jason Garrett-Glaser
<darkshikari@gmail.com>
Thu, 18 Jun 2009 19:31:12 +0000
(19:31 +0000)
committer
Jason Garrett-Glaser
<darkshikari@gmail.com>
Thu, 18 Jun 2009 19:31:12 +0000
(19:31 +0000)
Originally committed as revision 19219 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
a279121
..
fbd40d4
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-112,6
+112,7
@@
const AVCodecTag codec_bmp_tags[] = {
{ CODEC_ID_MPEG1VIDEO, MKTAG('V', 'C', 'R', '2') },
{ CODEC_ID_MPEG1VIDEO, MKTAG( 1 , 0 , 0 , 16) },
{ CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) },
+ { CODEC_ID_MPEG4, MKTAG( 4 , 0 , 0 , 16) },
{ CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') },
{ CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') },
{ CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */