[SCM] libav/experimental: Replace FLAC FourCC by TwoCC.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:52:19 UTC 2013
The following commit has been merged in the experimental branch:
commit 39051d5d6e28ae89449fbc5661ae05bac4112251
Author: Diego Biurrun <diego at biurrun.de>
Date: Mon Oct 16 11:18:26 2006 +0000
Replace FLAC FourCC by TwoCC.
Originally committed as revision 6708 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 431211d..cf6a6bc 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -193,9 +193,9 @@ const CodecTag codec_wav_tags[] = {
{ CODEC_ID_ADPCM_CT, 0x200 },
{ CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' },
{ CODEC_ID_TRUESPEECH, 0x22 },
+ { CODEC_ID_FLAC, 0xF1AC },
/* FIXME: All of the IDs below are not 16 bit and thus illegal. */
- { CODEC_ID_FLAC, MKTAG('f', 'L', 'a', 'C') },
{ CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1') },
{ CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K') },
{ CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n') },
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list