Remove an overambitious sanity check in the fecdec filter.

[paraslash.git] / mp3dec_filter.c

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index e9d84c1baf366ef4390082bca5e8f27c289e7008..90293f0a7e0e76dd2b53daf5901b4f185533861d 100644 (file)
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */


@@ -10,6 +10,7 @@
 #include "mp3dec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "mp3dec_filter.cmdline.h"
 #include "list.h"
 #include "sched.h"

+#include "ggo.h"

 #include "filter.h"
 #include "error.h"
 #include <mad.h>
 #include "filter.h"
 #include "error.h"
 #include <mad.h>


@@ -33,7 +34,7 @@ static ssize_t mp3dec(char *inbuffer, size_t len, struct filter_node *fn)
 {
        int i, ret;
        struct private_mp3dec_data *pmd = fn->private_data;
 {
        int i, ret;
        struct private_mp3dec_data *pmd = fn->private_data;

-       size_t copy = PARA_MIN(len, 4096);
+       size_t copy = PARA_MIN(len, (size_t)4096);

 
        if (fn->loaded + 16384 > fn->bufsize)
                return 0;
 
        if (fn->loaded + 16384 > fn->bufsize)
                return 0;


@@ -150,8 +151,15 @@ err:
  */
 void mp3dec_filter_init(struct filter *f)
 {
  */
 void mp3dec_filter_init(struct filter *f)
 {

+       struct mp3dec_filter_args_info dummy;
+
+       mp3dec_cmdline_parser_init(&dummy);

        f->open = mp3dec_open;
        f->convert = mp3dec;
        f->close = mp3dec_close;
        f->parse_config = mp3dec_parse_config;
        f->open = mp3dec_open;
        f->convert = mp3dec;
        f->close = mp3dec_close;
        f->parse_config = mp3dec_parse_config;

+       f->help = (struct ggo_help) {
+               .short_help = mp3dec_filter_args_info_help,
+               .detailed_help = mp3dec_filter_args_info_detailed_help
+       };

 }
 }