From bf3f8b16f6645f9957f33a8f35a1049ec33cf939 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Sat, 3 Aug 2002 21:56:02 +0000 Subject: [PATCH] minor formatting --- src/flac/encode.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/flac/encode.c b/src/flac/encode.c index 7a5c18be..cf4e01e1 100644 --- a/src/flac/encode.c +++ b/src/flac/encode.c @@ -1669,15 +1669,12 @@ FLAC__StreamDecoderReadStatus verify_read_callback(const FLAC__StreamDecoder *de encoder_wrapper->verify_fifo.needs_magic_hack = false; } else { - if(encoded_bytes <= *bytes) { + //@@@ if(encoded_bytes == 0)? need some check for underflow so we don't deadlock + if(encoded_bytes < *bytes) *bytes = encoded_bytes; - memcpy(buffer, encoder_wrapper->verify_fifo.encoded_signal, *bytes); - } - else { - memcpy(buffer, encoder_wrapper->verify_fifo.encoded_signal, *bytes); - encoder_wrapper->verify_fifo.encoded_signal += *bytes; - encoder_wrapper->verify_fifo.encoded_bytes -= *bytes; - } + memcpy(buffer, encoder_wrapper->verify_fifo.encoded_signal, *bytes); + encoder_wrapper->verify_fifo.encoded_signal += *bytes; + encoder_wrapper->verify_fifo.encoded_bytes -= *bytes; } return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;