diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2006-07-08 07:14:00 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2006-07-08 07:14:00 +0000 |
| commit | f1b163e01e26e261890851c799fd508e99e2da46 (patch) | |
| tree | d93f4950bd8dccc1bc79f81797206070e450852f | |
| parent | ab7e31539645795f3b41df8199c6c111e442351e (diff) | |
set proper bits_per_sample value for ADPCM codecs
Originally committed as revision 5666 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/utils.c | 6 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 574238e79f..30d9d17f63 100644 --- 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 d51e64ae48..f5598e57d7 100644 --- 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) |