From eb9cf50a74aa44827e790d8de59be4359548821c Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Wed, 20 Aug 2008 00:49:45 +0000 Subject: matroska: add support for most variants of PCM Originally committed as revision 14862 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/matroska.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'libavformat/matroska.c') diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 01e9decdf4..8862d7c585 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -41,9 +41,15 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_MPEG/L3" , CODEC_ID_MP3}, {"A_MPEG/L2" , CODEC_ID_MP2}, {"A_MPEG/L1" , CODEC_ID_MP2}, - {"A_PCM/INT/BIG" , CODEC_ID_PCM_U16BE}, - {"A_PCM/INT/LIT" , CODEC_ID_PCM_U16LE}, -// {"A_PCM/FLOAT/IEEE" , CODEC_ID_NONE}, + {"A_PCM/INT/BIG" , CODEC_ID_PCM_S16BE}, + {"A_PCM/INT/BIG" , CODEC_ID_PCM_S24BE}, + {"A_PCM/INT/BIG" , CODEC_ID_PCM_S32BE}, + {"A_PCM/INT/LIT" , CODEC_ID_PCM_S16LE}, + {"A_PCM/INT/LIT" , CODEC_ID_PCM_S24LE}, + {"A_PCM/INT/LIT" , CODEC_ID_PCM_S32LE}, + {"A_PCM/INT/LIT" , CODEC_ID_PCM_U8}, + {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE}, + {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE}, {"A_AC3" , CODEC_ID_AC3}, // {"A_EAC3" , CODEC_ID_EAC3}, {"A_DTS" , CODEC_ID_DTS}, -- cgit v1.2.3