X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec.c;h=714d620e7adb06a414e5eba3a0d3fe55cef476b8;hp=4ef16b0886673759c3f8308041906a433dd7824c;hb=68c418757c730233c63efcc3a5731b90f63238f3;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/oggdec.c b/oggdec.c
index 4ef16b08..714d620e 100644
--- a/oggdec.c
+++ b/oggdec.c
@@ -18,7 +18,6 @@
 
 /** \file oggdec.c paraslash's ogg vorbis decoder */
 
-#include "gcc-compat.h"
 #include "para.h"
 
 #include "oggdec_filter.cmdline.h"
@@ -99,7 +98,7 @@ static void ogg_open(struct filter_node *fn)
 {
 	struct private_oggdec_data *pod = para_calloc(
 		sizeof(struct private_oggdec_data));
-	struct gengetopt_args_info *conf = fn->conf;
+	struct oggdec_filter_args_info *conf = fn->conf;
 
 	fn->private_data = pod;
 	fn->bufsize = conf->bufsize_arg * 1024;
@@ -126,7 +125,7 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 {
 	ssize_t ret;
 	struct private_oggdec_data *pod = fn->private_data;
-	struct gengetopt_args_info *conf = fn->conf;
+	struct oggdec_filter_args_info *conf = fn->conf;
 	/* make the buffer known to the read callback cb_read() */
 	pod->inbuf = inbuffer;
 	pod->inbuf_len = len;
@@ -135,12 +134,12 @@ static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
 	if (!pod->vf) {
 		int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
 		if (len <ib && !*fn->fci->eof && !fn->fci->error) {
-			PARA_INFO_LOG("initial input buffer %d/%d, waiting for more data\n",
+			PARA_INFO_LOG("initial input buffer %zd/%d, waiting for more data\n",
 				len, ib);
 			return 0;
 		}
 		pod->vf = para_malloc(sizeof(struct OggVorbis_File));
-		PARA_NOTICE_LOG("input buffer: %d, opening ov callbacks\n", len);
+		PARA_NOTICE_LOG("input buffer: %zd, opening ov callbacks\n", len);
 		ret = ov_open_callbacks(fn, pod->vf,
 			NULL, /* no initial buffer */
 			0, /* no initial bytes */
@@ -175,7 +174,7 @@ again:
 
 static void *oggdec_parse_config(int argc, char **argv)
 {
-	struct gengetopt_args_info *ret = para_calloc(sizeof(struct gengetopt_args_info));
+	struct oggdec_filter_args_info *ret = para_calloc(sizeof(struct oggdec_filter_args_info));
 	if (!oggdec_cmdline_parser(argc, argv, ret))
 		return ret;
 	free(ret);