# HG changeset patch # User pross # Date 1217932705 0 # Node ID 2f769a4057e7ea5762c07a5196b5dadf5a94f5e8 # Parent e8f67b6063c3b730aa9ebf1f805470984273557e Support muxing of Zork PCM audio into RIFF formats. diff -r e8f67b6063c3 -r 2f769a4057e7 riff.c --- 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;