Originally committed as revision 5666 to svn://svn.ffmpeg.org/ffmpeg/trunk
int av_get_bits_per_sample(enum CodecID codec_id){
switch(codec_id){
- case CODEC_ID_ADPCM_CT:
case CODEC_ID_ADPCM_SBPRO_2:
+ return 2;
case CODEC_ID_ADPCM_SBPRO_3:
+ return 3;
case CODEC_ID_ADPCM_SBPRO_4:
- return 0;
+ case CODEC_ID_ADPCM_CT:
+ return 4;
case CODEC_ID_PCM_ALAW:
case CODEC_ID_PCM_MULAW:
case CODEC_ID_PCM_S8:
if (bits_per_sample) {
if (enc->channels == 0)
return -1;
- frame_size = size / ((bits_per_sample >> 3) * enc->channels);
+ frame_size = (size << 3) / (bits_per_sample * enc->channels);
} else {
/* used for example by ADPCM codecs */
if (enc->bit_rate == 0)