diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 16:50:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 16:50:59 +0200 |
| commit | 99f50907143b096009682481ba4c5129ab65149e (patch) | |
| tree | 5371536651706cc964e33c4f77169d67b22009d0 /libavformat/aiffdec.c | |
| parent | 4abb88d7e84208d86750091b3ec9082767ca74c1 (diff) | |
aiffdec: try #2 to fix bps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiffdec.c')
| -rw-r--r-- | libavformat/aiffdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index d56ab5306d..728e1f7e01 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -105,7 +105,7 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size, codec->codec_type = AVMEDIA_TYPE_AUDIO; codec->channels = avio_rb16(pb); num_frames = avio_rb32(pb); - codec->bits_per_coded_sample = avio_rb16(pb) / FFMAX(codec->channels, 1); + codec->bits_per_coded_sample = avio_rb16(pb); exp = avio_rb16(pb); val = avio_rb64(pb); @@ -160,7 +160,7 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size, /* Block align needs to be computed in all cases, as the definition * is specific to applications -> here we use the WAVE format definition */ if (!codec->block_align) - codec->block_align = (codec->bits_per_coded_sample * codec->channels) >> 3; + codec->block_align = (av_get_bits_per_sample(codec->codec_id) * codec->channels) >> 3; if (aiff->block_duration) { codec->bit_rate = codec->sample_rate * (codec->block_align << 3) / |