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/filter/af_lavcac3enc.c | |
| 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/filter/af_lavcac3enc.c')
| -rw-r--r-- | audio/filter/af_lavcac3enc.c | 7 |
1 files changed, 3 insertions, 4 deletions
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) { |