[SCM] libav/experimental: flac fourcc (fixes mplayer -demuxer 35 with flac)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:51:51 UTC 2013


The following commit has been merged in the experimental branch:
commit 4b1a1a2a69e14c1a7e370b5723fa970d1f15af3f
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Oct 6 18:36:58 2006 +0000

    flac fourcc (fixes mplayer -demuxer 35 with flac)
    
    Originally committed as revision 6569 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 0b81f29..c14bfbb 100644
--- 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') },

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list