fix bug in sample_number calculation from frame header

diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index ad1adae017092400ba8b2a460ef7464ffe443035..7674fa777b6ac767851c1c4564e2e4da30876c2e 100644 (file)
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -1662,13 +1662,15 @@ FLAC__bool read_frame_header_(FLAC__StreamDecoder *decoder)
                        return true;
                }
                decoder->private_->last_frame_number = x;
-               if(decoder->private_->has_stream_info) {
-                       decoder->private_->frame.header.number_type = FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER;
-                       decoder->private_->frame.header.number.sample_number = (FLAC__int64)decoder->private_->stream_info.data.stream_info.min_blocksize * (FLAC__int64)x;
-               }
-               else {
-                       is_unparseable = true;
+               decoder->private_->frame.header.number_type = FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER;
+               if(blocksize_hint) {
+                       if(decoder->private_->has_stream_info)
+                               decoder->private_->frame.header.number.sample_number = (FLAC__int64)decoder->private_->stream_info.data.stream_info.min_blocksize * (FLAC__int64)x;
+                       else
+                               is_unparseable = true;
                }
+               else    
+                       decoder->private_->frame.header.number.sample_number = (FLAC__int64)decoder->private_->frame.header.blocksize * (FLAC__int64)x;
        }
 
        if(blocksize_hint) {