Merge branch 't/test_man'

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 9cea898035d77bea71c860a486e6bf609faeffbd..d63236da5112d2ea9a9ac52d80c31abdc0ad78f4 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -122,7 +122,7 @@ next_buffer:
                        ret = -E_AACDEC_INIT;
                        if (NeAACDecInit2(padd->handle, p,
                                        padd->decoder_length, &rate,
-                                       &channels) < 0)
+                                       &channels) != 0)
                                goto out;
                }
                padd->sample_rate = rate;
@@ -218,7 +218,6 @@ void aacdec_filter_init(struct filter *f)
        f->open = aacdec_open;
        f->close = aacdec_close;
        f->pre_select = generic_filter_pre_select;
-       f->new_post_select = aacdec_post_select;
-       f->post_select = NULL;
+       f->post_select = aacdec_post_select;
        f->execute = aacdec_execute;
 }