diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 02:02:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-27 02:54:00 +0200 |
| commit | b9b97c2fb916982c87b74821117fc6c41a80aa7e (patch) | |
| tree | c6e7a1d0d16fbdfb6667c729dd28b313b920dd12 /libavformat | |
| parent | a366beaf6a7cbaa43fef09cabc2248225290208f (diff) | |
| download | ffmpeg-b9b97c2fb916982c87b74821117fc6c41a80aa7e.tar.gz | |
aiffdec: fix bits per sample
Fixes Ticket1660
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/aiffdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 83fa9c3548..d56ab5306d 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); + codec->bits_per_coded_sample = avio_rb16(pb) / FFMAX(codec->channels, 1); exp = avio_rb16(pb); val = avio_rb64(pb); |