X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oggdec_filter.c;h=0fa56f1187294f1148b3672c74e1b2ccf9f8568d;hp=042e13b001796821f424547bb73710c827b1ec67;hb=5c3867cc94d45ed34667ee01098228656027e277;hpb=d7e95515b8515bf9c2ea58579a0b8133194aaa4b

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 042e13b0..0fa56f11 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -92,24 +92,22 @@ static const ov_callbacks ovc = {
 
 static void ogg_open(struct filter_node *fn)
 {
-	struct private_oggdec_data *pod = para_calloc(
-		sizeof(struct private_oggdec_data));
-
-	fn->private_data = pod;
+	fn->private_data = para_calloc(sizeof(struct private_oggdec_data));
 	fn->min_iqs = 8000;
 }
 
 static void ogg_close(struct filter_node *fn)
 {
 	struct private_oggdec_data *pod = fn->private_data;
-	if (pod->vf) {
+
+	if (pod && pod->vf) {
 		PARA_DEBUG_LOG("ov_clearing %p, pod = %p\n", pod->vf, pod);
 		ov_clear(pod->vf);
 		free(pod->vf);
 		pod->vf = NULL;
 	} else
 		PARA_DEBUG_LOG("nothing to close\n");
-	free(fn->private_data);
+	free(pod);
 	fn->private_data = NULL;
 }
 
@@ -179,7 +177,7 @@ out:
 	return ret;
 }
 
-static void ogg_pre_select(__a_unused struct sched *s, struct task *t)
+static void ogg_pre_select(struct sched *s, struct task *t)
 {
 	struct filter_node *fn = container_of(t, struct filter_node, task);
 	int ret;