Commit 4e0e6888 authored by Peter Ross's avatar Peter Ross

Support muxing of Zork PCM audio into RIFF formats.

Originally committed as revision 14617 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5968d2dd
...@@ -174,6 +174,7 @@ const AVCodecTag codec_wav_tags[] = { ...@@ -174,6 +174,7 @@ const AVCodecTag codec_wav_tags[] = {
{ CODEC_ID_PCM_MULAW, 0x0007 }, { CODEC_ID_PCM_MULAW, 0x0007 },
{ CODEC_ID_WMAVOICE, 0x000A }, { CODEC_ID_WMAVOICE, 0x000A },
{ CODEC_ID_ADPCM_IMA_WAV, 0x0011 }, { 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_ADPCM_YAMAHA, 0x0020 },
{ CODEC_ID_TRUESPEECH, 0x0022 }, { CODEC_ID_TRUESPEECH, 0x0022 },
{ CODEC_ID_GSM_MS, 0x0031 }, { CODEC_ID_GSM_MS, 0x0031 },
...@@ -241,7 +242,8 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) ...@@ -241,7 +242,8 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
put_le32(pb, enc->sample_rate); put_le32(pb, enc->sample_rate);
if (enc->codec_id == CODEC_ID_PCM_U8 || if (enc->codec_id == CODEC_ID_PCM_U8 ||
enc->codec_id == CODEC_ID_PCM_ALAW || 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; bps = 8;
} else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS) { } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS) {
bps = 0; bps = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment