X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=f3c25a261ea5cc9c3b49398c850dba00e82afd35;hp=9ab694cf47d96c284cfe6af9b7caffcdcbf217f7;hb=8faafd97cfa6aa07cb79d908022001c5dffb3bc6;hpb=042767ce4032ee7bec7df1716411a175259cfbf1

diff --git a/afh.c b/afh.c
index 9ab694cf..f3c25a26 100644
--- a/afh.c
+++ b/afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -64,6 +64,7 @@ __noreturn static void print_help_and_die(void)
 	unsigned flags = d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS;
 
 	ggo_print_help(&h, flags);
+	printf("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
 	exit(EXIT_SUCCESS);
 }
 
@@ -91,7 +92,6 @@ int main(int argc, char **argv)
 	ret = -E_AFH_SYNTAX;
 	if (conf.inputs_num == 0)
 		goto out;
-	afh_init();
 	for (i = 0; i < conf.inputs_num; i++) {
 		int ret2;
 		ret = mmap_full_file(conf.inputs[i], O_RDONLY, &audio_file_data,
@@ -102,16 +102,16 @@ int main(int argc, char **argv)
 		}
 		ret = compute_afhi(conf.inputs[i], audio_file_data, audio_file_size,
 			fd, &afhi);
-		if (ret < 0)
-			goto out;
-
-		audio_format_num = ret;
-		printf("File %d: %s\n", i + 1, conf.inputs[i]);
-		print_info(audio_format_num, &afhi);
-		if (conf.chunk_table_given)
-			print_chunk_table(&afhi);
-		printf("\n");
-		clear_afhi(&afhi);
+		if (ret >= 0) {
+			audio_format_num = ret;
+			printf("File %d: %s\n", i + 1, conf.inputs[i]);
+			print_info(audio_format_num, &afhi);
+			if (conf.chunk_table_given)
+				print_chunk_table(&afhi);
+			printf("\n");
+			clear_afhi(&afhi);
+		}
+		close(fd);
 		ret2 = para_munmap(audio_file_data, audio_file_size);
 		if (ret2 < 0 && ret >= 0)
 			ret = ret2;