diff options
| author | Daniel Verkamp <daniel@drv.nu> | 2010-01-06 21:51:20 +0000 |
|---|---|---|
| committer | Daniel Verkamp <daniel@drv.nu> | 2010-01-06 21:51:20 +0000 |
| commit | 9df9b810c58829d147cfabe7f6f2e469025ca29a (patch) | |
| tree | a836795ee52c04e77bb1f8a311fc7dd65af25c47 /libavformat/riff.c | |
| parent | 1e289b09790ffbb3ff5b9730692c4d17ad6b78a2 (diff) | |
| download | ffmpeg-9df9b810c58829d147cfabe7f6f2e469025ca29a.tar.gz | |
Handle more ADPCM codecs in av_get_bits_per_sample().
This removes some special-case code from riff.c.
CODEC_ID_ADPCM_G726 is still handled in riff.c as before because it is
not guaranteed to be fixed 4 bits per sample.
Originally committed as revision 21037 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index fcc9137927..0fd4a83ed3 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -336,7 +336,7 @@ int ff_put_wav_header(ByteIOContext *pb, AVCodecContext *enc) put_le32(pb, enc->sample_rate); if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_GSM_MS) { 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 || enc->codec_id == CODEC_ID_ADPCM_YAMAHA) { // + } else if (enc->codec_id == CODEC_ID_ADPCM_G726) { bps = 4; } else { if (!(bps = av_get_bits_per_sample(enc->codec_id))) |