X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ogg_afh.c;h=cce1eb54f40c02d05e96419c1afd0e849c18c6a4;hp=874947e8e3175199aaa780995aac519d8a9aaa66;hb=75375ddad82067c8f5cf3ecafc3dd231eeb393b0;hpb=854470b35cfb95851465622f843758e4272221cf

diff --git a/ogg_afh.c b/ogg_afh.c
index 874947e8..cce1eb54 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -37,7 +37,7 @@ static FILE *infile;
 static int header_len, oggbuf_len, vi_channels;
 static char *header, *oggbuf;
 static ssize_t *chunk_table, max_chunk_len;
-struct audio_format_handler *af;
+static struct audio_format_handler *af;
 static long vi_sampling_rate, vi_bitrate, vi_bitrate_nominal,
 	num_chunks;
 
@@ -129,7 +129,7 @@ static void tunetable(void)
 			continue;
 		}
 		if (j < 0)
-			tv_scale(i + 2, &af->chunk_tv, &af->eof_tv);
+			tv_scale(i, &af->chunk_tv, &af->eof_tv);
 		for (j = lp; j < i; j++)
 			chunk_table[j] = chunk_table[i];
 		lp = i;
@@ -207,14 +207,14 @@ static void ogg_close_audio_file(void)
 	oggbuf_len = 0;
 }
 
-static int ogg_save_header(FILE *file, int header_len)
+static int ogg_save_header(FILE *file, int len)
 {
 	int ret;
 
-	header = para_malloc(header_len);
+	header = para_malloc(len);
 	rewind(file);
-	ret = read(fileno(file), header, header_len);
-	if (ret != header_len)
+	ret = read(fileno(file), header, len);
+	if (ret != len)
 		return -E_OGG_READ;
 	return 1;
 }