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 /libavcodec | |
| 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 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 99c97c1895..5dd4e34df4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -963,6 +963,9 @@ int av_get_bits_per_sample(enum CodecID codec_id){ return 3; case CODEC_ID_ADPCM_SBPRO_4: case CODEC_ID_ADPCM_CT: + case CODEC_ID_ADPCM_WAV: + case CODEC_ID_ADPCM_MS: + case CODEC_ID_ADPCM_YAMAHA: return 4; case CODEC_ID_PCM_ALAW: case CODEC_ID_PCM_MULAW: |