Mercurial > libavcodec.hg
comparison utils.c @ 10777:c4e157b47af5 libavcodec
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 | 4546d91de818 |
| children | 90f34aa8fe0a |
comparison
equal
deleted
inserted
replaced
| 10776:816067b00019 | 10777:c4e157b47af5 |
|---|---|
| 961 return 2; | 961 return 2; |
| 962 case CODEC_ID_ADPCM_SBPRO_3: | 962 case CODEC_ID_ADPCM_SBPRO_3: |
| 963 return 3; | 963 return 3; |
| 964 case CODEC_ID_ADPCM_SBPRO_4: | 964 case CODEC_ID_ADPCM_SBPRO_4: |
| 965 case CODEC_ID_ADPCM_CT: | 965 case CODEC_ID_ADPCM_CT: |
| 966 case CODEC_ID_ADPCM_WAV: | |
| 967 case CODEC_ID_ADPCM_MS: | |
| 968 case CODEC_ID_ADPCM_YAMAHA: | |
| 966 return 4; | 969 return 4; |
| 967 case CODEC_ID_PCM_ALAW: | 970 case CODEC_ID_PCM_ALAW: |
| 968 case CODEC_ID_PCM_MULAW: | 971 case CODEC_ID_PCM_MULAW: |
| 969 case CODEC_ID_PCM_S8: | 972 case CODEC_ID_PCM_S8: |
| 970 case CODEC_ID_PCM_U8: | 973 case CODEC_ID_PCM_U8: |