set proper bits_per_sample value for ADPCM codecs

Originally committed as revision 5666 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 574238e..30d9d17 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1306,11 +1306,13 @@ char av_get_pict_type_char(int pict_type){
 
 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:

diff --git a/libavformat/utils.c b/libavformat/utils.c
index d51e64a..f5598e5 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -658,7 +658,7 @@ static int get_audio_frame_size(AVCodecContext *enc, int size)
         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)