diff options
Diffstat (limited to 'audio/filter')
| -rw-r--r-- | audio/filter/af.c | 4 | ||||
| -rw-r--r-- | audio/filter/af_lavcac3enc.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/audio/filter/af.c b/audio/filter/af.c index 3737228ddf..91f3e907f1 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -204,9 +204,9 @@ static struct af_instance *af_create(struct af_stream *s, char *name, goto error; if (args && af->control) { // Single option string for old filters - char *s = (char *)args; // m_config_initialize_obj did this + char *opts = (char *)args; // m_config_initialize_obj did this assert(!af->priv); - if (af->control(af, AF_CONTROL_COMMAND_LINE, s) <= AF_ERROR) + if (af->control(af, AF_CONTROL_COMMAND_LINE, opts) <= AF_ERROR) goto error; } diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c index 7eacc01d81..5371f7aa7d 100644 --- a/audio/filter/af_lavcac3enc.c +++ b/audio/filter/af_lavcac3enc.c @@ -175,15 +175,15 @@ static void uninit(struct af_instance* af) } // Filter data through filter -static struct mp_audio* play(struct af_instance* af, struct mp_audio* data) +static struct mp_audio* play(struct af_instance* af, struct mp_audio* audio) { af_ac3enc_t *s = af->setup; - struct mp_audio *c = data; // Current working data + struct mp_audio *c = audio; // Current working data struct mp_audio *l; int left, outsize = 0; char *buf, *src; int max_output_len; - int frame_num = (data->len + s->pending_len) / s->expect_len; + int frame_num = (audio->len + s->pending_len) / s->expect_len; int samplesize = af_fmt2bits(s->in_sampleformat) / 8; if (s->add_iec61937_header) |