diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-03-06 20:08:17 -0800 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-13 23:12:00 +0100 |
| commit | e1b4614ab463f8ef4e350e0750fdefddea392135 (patch) | |
| tree | b1abbcaa760971c20fdeeb44dbd5dfca3ec32ab0 | |
| parent | c3bf08d04cdec3d4fd5c4ea70e14b5edca2c45a7 (diff) | |
| download | ffmpeg-e1b4614ab463f8ef4e350e0750fdefddea392135.tar.gz | |
lpcm: fix sample size calculation for 20bit LCPM.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit f1320dc3bed281bb2f3c5531c52b6a6246e2394a)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/pcm-mpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c index 9ab6fc3ff0..f010b970bf 100644 --- a/libavcodec/pcm-mpeg.c +++ b/libavcodec/pcm-mpeg.c @@ -156,7 +156,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, /* There's always an even number of channels in the source */ num_source_channels = FFALIGN(avctx->channels, 2); - sample_size = (num_source_channels * avctx->bits_per_coded_sample) >> 3; + sample_size = (num_source_channels * (avctx->sample_fmt == AV_SAMPLE_FMT_S16 ? 16 : 24)) >> 3; samples = buf_size / sample_size; /* get output buffer */ |