aacdec: Remove pointless variable p.

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index bbaeb7995eb78a7c63e5c35edc0841ef26921448..c829984672d0799578cb5448a75bac48e5760ec7 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -97,7 +97,7 @@ static int aacdec_post_select(__a_unused struct sched *s, void *context)
        struct btr_node *btrn = fn->btrn;
        struct private_aacdec_data *padd = fn->private_data;
        int i, ret;
-       char *p, *inbuf, *outbuffer;
+       char *inbuf, *outbuffer;
        char *btr_buf;
        size_t len, consumed, loaded;
 
@@ -130,11 +130,10 @@ next_buffer:
        }
        if (consumed >= len)
                goto success;
-       p = inbuf + consumed;
        //PARA_CRIT_LOG("consumed: %zu (%zu + %zu), have: %zu\n", padd->consumed_total + consumed,
        //      padd->consumed_total, consumed, len - consumed);
        outbuffer = NeAACDecDecode(padd->handle, &padd->frame_info,
-               (unsigned char *)p, len - consumed);
+               (unsigned char *)inbuf + consumed, len - consumed);
        if (padd->frame_info.error) {
                int err = padd->frame_info.error;
                ret = -E_AAC_DECODE;
@@ -165,11 +164,9 @@ next_buffer:
        btr_add_output(btr_buf, loaded, btrn);
 success:
        ret = consumed;
-       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);