From: Andre Noll <maan@systemlinux.org>
Date: Sat, 14 Nov 2009 12:17:53 +0000 (+0100)
Subject: wmadec: Remove some redundant braces.
X-Git-Tag: v0.4.1~20
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=e5a8a6805e12baade86cdab549b80863c2d1a843

wmadec: Remove some redundant braces.
---

diff --git a/wmadec_filter.c b/wmadec_filter.c
index a17c90ad..fdf3da91 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -290,13 +290,12 @@ static int wma_init(struct private_wmadec_data *pwd)
 		return -E_WMA_BAD_PARAMS;
 
 	/* compute MDCT block size */
-	if (ahi->sample_rate <= 16000) {
+	if (ahi->sample_rate <= 16000)
 		pwd->frame_len_bits = 9;
-	} else if (ahi->sample_rate <= 22050) {
+	else if (ahi->sample_rate <= 22050)
 		pwd->frame_len_bits = 10;
-	} else {
+	else
 		pwd->frame_len_bits = 11;
-	}
 	pwd->frame_len = 1 << pwd->frame_len_bits;
 	if (pwd->use_variable_block_len) {
 		int nb_max, nb;
@@ -353,24 +352,22 @@ static int wma_init(struct private_wmadec_data *pwd)
 			high_freq = high_freq * 0.5;
 		else
 			high_freq = high_freq * 0.3;
-	} else if (sample_rate1 == 11025) {
+	} else if (sample_rate1 == 11025)
 		high_freq = high_freq * 0.7;
-	} else if (sample_rate1 == 8000) {
-		if (bps <= 0.625) {
+	else if (sample_rate1 == 8000) {
+		if (bps <= 0.625)
 			high_freq = high_freq * 0.5;
-		} else if (bps > 0.75) {
+		else if (bps > 0.75)
 			pwd->use_noise_coding = 0;
-		} else {
+		else
 			high_freq = high_freq * 0.65;
-		}
 	} else {
-		if (bps >= 0.8) {
+		if (bps >= 0.8)
 			high_freq = high_freq * 0.75;
-		} else if (bps >= 0.6) {
+		else if (bps >= 0.6)
 			high_freq = high_freq * 0.6;
-		} else {
+		else
 			high_freq = high_freq * 0.5;
-		}
 	}
 	PARA_INFO_LOG("channels=%d sample_rate=%d "
 		"bitrate=%d block_align=%d\n",