Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / pcm-mpeg.c

diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c
index 4269dd444335922f829e08be6ea1e67ab6dd4372..aea3ff79c6c6a4c721f557a4d7e9b76f8fde4c1c 100644 (file)
--- a/libavcodec/pcm-mpeg.c
+++ b/libavcodec/pcm-mpeg.c
@@ -158,7 +158,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 */