diff options
| author | Vidar Madsen <vidarino@gmail.com> | 2005-07-15 09:14:25 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-07-15 09:14:25 +0000 |
| commit | 694eaead0cf9624466366c7ddd86886ca7150355 (patch) | |
| tree | 8ff6c90a9d8d0a0e7d362fdea04484167bc1c9f4 /libavformat/wav.c | |
| parent | 2ff4524e7243a628e26d34bf353beeba4f217f61 (diff) | |
Yamaha ADPCM in wav patch by (Vidar Madsen: vidarino, gmail com)
Originally committed as revision 4443 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/wav.c')
| -rw-r--r-- | libavformat/wav.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/wav.c b/libavformat/wav.c index d1f1bc65c9..427453b3a8 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -29,6 +29,7 @@ const CodecTag codec_wav_tags[] = { { CODEC_ID_PCM_MULAW, 0x07 }, { CODEC_ID_ADPCM_MS, 0x02 }, { CODEC_ID_ADPCM_IMA_WAV, 0x11 }, + { CODEC_ID_ADPCM_YAMAHA, 0x20 }, { CODEC_ID_ADPCM_G726, 0x45 }, { CODEC_ID_ADPCM_IMA_DK4, 0x61 }, /* rogue format number */ { CODEC_ID_ADPCM_IMA_DK3, 0x62 }, /* rogue format number */ @@ -65,7 +66,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc) bps = 8; } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) { 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; } else { bps = 16; |