diff options
author | wm4 <wm4@nowhere> | 2013-12-04 23:06:26 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-04 23:13:46 +0100 |
commit | 193930ac3b1cffb65782f7db9b611c09cf48f9f0 (patch) | |
tree | feafb97ff017d0c296eeaa32a11ae58ac4544cd9 /audio | |
parent | 09bd19e59ee1b4cf9b8db16403a0c3f404af833a (diff) | |
download | mpv-193930ac3b1cffb65782f7db9b611c09cf48f9f0.tar.bz2 mpv-193930ac3b1cffb65782f7db9b611c09cf48f9f0.tar.xz |
af: remove af->setup field
Used to be used by filters that didn't use the option parser.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/filter/af.c | 8 | ||||
-rw-r--r-- | audio/filter/af.h | 1 | ||||
-rw-r--r-- | audio/filter/af_lavcac3enc.c | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/audio/filter/af.c b/audio/filter/af.c index bb29603d5d..d7a0086d5b 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -139,7 +139,7 @@ static int input_control(struct af_instance* af, int cmd, void* arg) { switch (cmd) { case AF_CONTROL_REINIT: - assert(arg == &((struct af_stream *)af->setup)->input); + assert(arg == &((struct af_stream *)af->priv)->input); return AF_OK; } return AF_UNKNOWN; @@ -147,7 +147,7 @@ static int input_control(struct af_instance* af, int cmd, void* arg) static int output_control(struct af_instance* af, int cmd, void* arg) { - struct af_stream *s = af->setup; + struct af_stream *s = af->priv; struct mp_audio *output = &s->output; struct mp_audio *filter_output = &s->filter_output; @@ -593,7 +593,7 @@ struct af_stream *af_new(struct MPOpts *opts) .info = &in, .control = input_control, .play = dummy_play, - .setup = s, + .priv = s, .data = &s->input, .mul = 1.0, }; @@ -603,7 +603,7 @@ struct af_stream *af_new(struct MPOpts *opts) .info = &out, .control = output_control, .play = dummy_play, - .setup = s, + .priv = s, .data = &s->filter_output, .mul = 1.0, }; diff --git a/audio/filter/af.h b/audio/filter/af.h index 4e74ffbe4c..2d29d3f3ae 100644 --- a/audio/filter/af.h +++ b/audio/filter/af.h @@ -59,7 +59,6 @@ struct af_instance { int (*control)(struct af_instance *af, int cmd, void *arg); void (*uninit)(struct af_instance *af); struct mp_audio * (*play)(struct af_instance *af, struct mp_audio *data); - void *setup; // old field for priv structs void *priv; struct mp_audio *data; // configuration and buffer for outgoing data stream struct af_instance *next; diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c index ae652e12e9..a441dbe17d 100644 --- a/audio/filter/af_lavcac3enc.c +++ b/audio/filter/af_lavcac3enc.c @@ -65,7 +65,7 @@ typedef struct af_ac3enc_s { // Initialization and runtime control static int control(struct af_instance *af, int cmd, void *arg) { - af_ac3enc_t *s = af->setup; + af_ac3enc_t *s = af->priv; static const int default_bit_rate[AC3_MAX_CHANNELS+1] = \ {0, 96000, 192000, 256000, 384000, 448000, 448000}; @@ -139,7 +139,7 @@ static int control(struct af_instance *af, int cmd, void *arg) // Deallocate memory static void uninit(struct af_instance* af) { - af_ac3enc_t *s = af->setup; + af_ac3enc_t *s = af->priv; if (s) { av_free_packet(&s->pkt); @@ -154,7 +154,7 @@ static void uninit(struct af_instance* af) static struct mp_audio* play(struct af_instance* af, struct mp_audio* audio) { struct mp_audio *out = af->data; - af_ac3enc_t *s = af->setup; + af_ac3enc_t *s = af->priv; int num_frames = (audio->samples + mp_audio_buffer_samples(s->pending)) / s->in_samples; @@ -254,7 +254,6 @@ static int af_open(struct af_instance* af){ af->control=control; af->uninit=uninit; af->play=play; - af->setup=s; s->lavc_acodec = avcodec_find_encoder_by_name("ac3"); if (!s->lavc_acodec) { |