From 56cf54e880359d40dae7df460b23101a4f1a77fb Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 11 Sep 2008 07:47:28 +0200
Subject: output: removed audio_output.convertAudioFormat

Instead of checking convertAudioFormat, we can simply check if
reqAudioFormat is defined.  This saves 4 bytes in the struct.
---
 src/output_init.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/output_init.c')

diff --git a/src/output_init.c b/src/output_init.c
index d339f3540..0a91565c8 100644
--- a/src/output_init.c
+++ b/src/output_init.c
@@ -86,25 +86,22 @@ int audio_output_init(struct audio_output *ao, ConfigParam * param)
 	ao->plugin = plugin;
 	ao->open = 0;
 
-	ao->convertAudioFormat = 0;
 	ao->sameInAndOutFormats = 0;
 	ao->convBuffer = NULL;
 	ao->convBufferLen = 0;
 
 	memset(&ao->inAudioFormat, 0, sizeof(ao->inAudioFormat));
 	memset(&ao->outAudioFormat, 0, sizeof(ao->outAudioFormat));
-	memset(&ao->reqAudioFormat, 0, sizeof(ao->reqAudioFormat));
 	memset(&ao->convState, 0, sizeof(ConvState));
 
 	if (format) {
-		ao->convertAudioFormat = 1;
-
 		if (0 != parseAudioConfig(&ao->reqAudioFormat, format)) {
 			FATAL("error parsing format at line %i\n", bp->line);
 		}
 
 		ao->outAudioFormat = ao->reqAudioFormat;
-	}
+	} else
+		audio_format_clear(&ao->reqAudioFormat);
 
 	if (plugin->init(ao, param) != 0)
 		return 0;
-- 
cgit v1.2.3