Commit 694eaead authored by Vidar Madsen's avatar Vidar Madsen Committed by Michael Niedermayer

Yamaha ADPCM in wav patch by (Vidar Madsen: vidarino, gmail com)

Originally committed as revision 4443 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2ff4524e
...@@ -29,6 +29,7 @@ const CodecTag codec_wav_tags[] = { ...@@ -29,6 +29,7 @@ const CodecTag codec_wav_tags[] = {
{ CODEC_ID_PCM_MULAW, 0x07 }, { CODEC_ID_PCM_MULAW, 0x07 },
{ CODEC_ID_ADPCM_MS, 0x02 }, { CODEC_ID_ADPCM_MS, 0x02 },
{ CODEC_ID_ADPCM_IMA_WAV, 0x11 }, { CODEC_ID_ADPCM_IMA_WAV, 0x11 },
{ CODEC_ID_ADPCM_YAMAHA, 0x20 },
{ CODEC_ID_ADPCM_G726, 0x45 }, { CODEC_ID_ADPCM_G726, 0x45 },
{ CODEC_ID_ADPCM_IMA_DK4, 0x61 }, /* rogue format number */ { CODEC_ID_ADPCM_IMA_DK4, 0x61 }, /* rogue format number */
{ CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */ { CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */
...@@ -65,7 +66,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) ...@@ -65,7 +66,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
bps = 8; bps = 8;
} else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) { } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) {
bps = 0; bps = 0;
} else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS || enc->codec_id == CODEC_ID_ADPCM_G726) { // } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS || enc->codec_id == CODEC_ID_ADPCM_G726 || enc->codec_id == CODEC_ID_ADPCM_YAMAHA) { //
bps = 4; bps = 4;
} else { } else {
bps = 16; bps = 16;
......
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