]> git.tuebingen.mpg.de Git - paraslash.git/blobdiff - oggdec_filter.c
reset version to 'git'
[paraslash.git] / oggdec_filter.c
index 791be2763e51f8537381ead35e19b5da2c582405..cec9c6c3dd15e971fdff1934d668bbcccbe616d1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -236,13 +236,8 @@ static int ogg_post_select(__a_unused struct sched *s, struct task *t)
                        break;
                fn->min_iqs = 0;
                have += ret;
-               if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
-                       continue;
-               if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
+               if (have >= OGGDEC_OUTPUT_CHUNK_SIZE)
                        break;
-               btr_add_output(buf, have, btrn);
-               buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
-               have = 0;
        }
        pod->have_more = (ret > 0);
        if (have > 0) {
@@ -272,7 +267,6 @@ void oggdec_filter_init(struct filter *f)
        f->open = ogg_open;
        f->close = ogg_close;
        f->pre_select = ogg_pre_select;
-       f->new_post_select = ogg_post_select;
-       f->post_select = NULL;
+       f->post_select = ogg_post_select;
        f->execute = oggdec_execute;
 }