Merge branch 'master' into next

[paraslash.git] / resample_filter.c

diff --git a/resample_filter.c b/resample_filter.c
index bf28e975de2720f001be95ee06b269a1a8ecdd2c..6d4599a8f6718a4fafa7c3f2cf1e2296002609ac 100644 (file)
--- a/resample_filter.c
+++ b/resample_filter.c
@@ -28,7 +28,8 @@ struct resample_context {
        struct check_wav_context *cwc;
 };
 
-static int resample_execute(struct btr_node *btrn, const char *cmd, char **result)
+static int resample_execute(const struct btr_node *btrn, const char *cmd,
+               char **result)
 {
        struct filter_node *fn = btr_context(btrn);
        struct resample_context *ctx = fn->private_data;
@@ -220,7 +221,7 @@ static int resample_post_monitor(__a_unused struct sched *s, void *context)
        }
        btr_merge(btrn, fn->min_iqs);
        in_bytes = btr_next_buffer(btrn, (char **)&in);
-       ret = -E_RESAMPLE_EOF;
+       ret = -E_EOF;
        num_frames = in_bytes / 2 / ctx->channels;
        if (num_frames == 0)
                goto out;