Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'

[ffmpeg] / libavcodec / flac.c

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index a1ae7189921b67a1d438bdcc6cae88523f3e5b88..b07e4f8705239e373b0cf84f3c8118eb2f33e85c 100644 (file)
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -206,8 +206,7 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
     avctx->sample_rate = s->samplerate;
     avctx->bits_per_raw_sample = s->bps;
 
-    s->samples  = get_bits_long(&gb, 32) << 4;
-    s->samples |= get_bits(&gb, 4);
+    s->samples = get_bits_longlong(&gb, 36);
 
     skip_bits_long(&gb, 64); /* md5 sum */
     skip_bits_long(&gb, 64); /* md5 sum */