diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index a1ae718992..b07e4f8705 100644
--- 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 */