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:
92eb823
)
flac fourcc (fixes mplayer -demuxer 35 with flac)
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 6 Oct 2006 18:36:58 +0000
(18:36 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 6 Oct 2006 18:36:58 +0000
(18:36 +0000)
Originally committed as revision 6569 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
0b81f29
..
c14bfbb
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-191,6
+191,7
@@
const CodecTag codec_wav_tags[] = {
{ CODEC_ID_ADPCM_CT, 0x200 },
{ CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
{ CODEC_ID_TRUESPEECH, 0x22 },
+ { CODEC_ID_FLAC, MKTAG('f', 'L', 'a', 'C') },
// for NuppelVideo (nuv.c)
{ CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') },