aacdec: Remove check which is always true.

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index a5355d10cf12604440523387bc5168c8c0a76276..7e6f5b21c5d87cb2131e07db8c32d91a636d19ea 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -119,7 +119,7 @@ next_buffer:
                PARA_INFO_LOG("decoder init: %d\n", ret);
                if (ret < 0) {
                        ret = -E_AACDEC_INIT;
-                       goto out;
+                       goto err;
                }
                consumed = ret;
                padd->sample_rate = rate;
@@ -153,9 +153,8 @@ next_buffer:
        padd->error_count = 0;
        //PARA_CRIT_LOG("decoder ate %lu\n", padd->frame_info.bytesconsumed);
        consumed += padd->frame_info.bytesconsumed;
-       ret = consumed;
        if (!padd->frame_info.samples)
-               goto out;
+               goto success;
        btr_buf = para_malloc(2 * padd->frame_info.samples);
        loaded = 0;
        for (i = 0; i < padd->frame_info.samples; i++) {
@@ -166,12 +165,9 @@ next_buffer:
        btr_add_output(btr_buf, loaded, btrn);
 success:
        ret = consumed;
-out:
-       if (ret >= 0) {
-               padd->consumed_total += ret;
-               btr_consume(btrn, ret);
-               goto next_buffer;
-       }
+       padd->consumed_total += ret;
+       btr_consume(btrn, ret);
+       goto next_buffer;
 err:
        assert(ret < 0);
        btr_remove_node(&fn->btrn);