Mercurial > libavformat.hg

changeset 5499:b63f760bb483 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author daniel
date Wed, 06 Jan 2010 21:51:20 +0000
parents e81fb2bec962
children fc0a32a383d3
files riff.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/riff.c	Tue Jan 05 20:14:50 2010 +0000
+++ b/riff.c	Wed Jan 06 21:51:20 2010 +0000
@@ -336,7 +336,7 @@
     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)))