From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Wed, 5 Jun 2002 05:53:17 +0000 (+0000)
Subject: minor consolidation
X-Git-Tag: 1.2.0~1858
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddc5bc7676de9771b0119a0651d991b408598393;p=platform%2Fupstream%2Fflac.git

minor consolidation
---

diff --git a/src/libFLAC/lpc.c b/src/libFLAC/lpc.c
index c0165c3..b993599 100644
--- a/src/libFLAC/lpc.c
+++ b/src/libFLAC/lpc.c
@@ -302,19 +302,7 @@ FLAC__real FLAC__lpc_compute_expected_bits_per_residual_sample(FLAC__real lpc_er
 
 	error_scale = 0.5 * M_LN2 * M_LN2 / (FLAC__real)total_samples;
 
-	if(lpc_error > 0.0) {
-		FLAC__real bps = (FLAC__real)((double)0.5 * log(error_scale * lpc_error) / M_LN2);
-		if(bps >= 0.0)
-			return bps;
-		else
-			return 0.0;
-	}
-	else if(lpc_error < 0.0) { /* error should not be negative but can happen due to inadequate float resolution */
-		return (FLAC__real)1e32;
-	}
-	else {
-		return 0.0;
-	}
+	return FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(lpc_error, error_scale);
 }
 
 FLAC__real FLAC__lpc_compute_expected_bits_per_residual_sample_with_error_scale(FLAC__real lpc_error, double error_scale)