Mercurial > libavformat.hg

changeset 3693:2f769a4057e7 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support muxing of Zork PCM audio into RIFF formats.
author pross
date Tue, 05 Aug 2008 10:38:25 +0000
parents e8f67b6063c3
children 191f342eb840
files riff.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/riff.c	Tue Aug 05 08:28:57 2008 +0000
+++ b/riff.c	Tue Aug 05 10:38:25 2008 +0000
@@ -174,6 +174,7 @@
     { CODEC_ID_PCM_MULAW,       0x0007 },
     { CODEC_ID_WMAVOICE,        0x000A },
     { CODEC_ID_ADPCM_IMA_WAV,   0x0011 },
+    { CODEC_ID_PCM_ZORK,        0x0011 }, /* must come after adpcm_ima_wav in this list */
     { CODEC_ID_ADPCM_YAMAHA,    0x0020 },
     { CODEC_ID_TRUESPEECH,      0x0022 },
     { CODEC_ID_GSM_MS,          0x0031 },
@@ -241,7 +242,8 @@
     put_le32(pb, enc->sample_rate);
     if (enc->codec_id == CODEC_ID_PCM_U8 ||
         enc->codec_id == CODEC_ID_PCM_ALAW ||
-        enc->codec_id == CODEC_ID_PCM_MULAW) {
+        enc->codec_id == CODEC_ID_PCM_MULAW ||
+        enc->codec_id == CODEC_ID_PCM_ZORK) {
         bps = 8;
     } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS) {
         bps = 0;