diff options
author | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:47:55 +0200 |
commit | e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2 (patch) | |
tree | 08b54ef9bb771434fc7fbe9185793503d3ba314c /audio/filter/af_extrastereo.c | |
parent | 6a83ef1552de4a1a71da49e45647ce1a4ce64e53 (diff) | |
parent | 48f94311516dc1426644b3e68b2a48c22727e1e7 (diff) | |
download | mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.bz2 mpv-e6e5a7b221ef2fcdd5a1982d6fdcb627100447d2.tar.xz |
Merge branch 'audio_changes'
Conflicts:
audio/out/ao_lavc.c
Diffstat (limited to 'audio/filter/af_extrastereo.c')
-rw-r--r-- | audio/filter/af_extrastereo.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/audio/filter/af_extrastereo.c b/audio/filter/af_extrastereo.c index 0f7fe36861..ed1fd27898 100644 --- a/audio/filter/af_extrastereo.c +++ b/audio/filter/af_extrastereo.c @@ -47,17 +47,14 @@ static int control(struct af_instance* af, int cmd, void* arg) // Sanity check if(!arg) return AF_ERROR; - af->data->rate = ((struct mp_audio*)arg)->rate; - af->data->nch = 2; - if (((struct mp_audio*)arg)->format == AF_FORMAT_FLOAT_NE) + mp_audio_copy_config(af->data, (struct mp_audio*)arg); + mp_audio_set_num_channels(af->data, 2); + if (af->data->format == AF_FORMAT_FLOAT_NE) { - af->data->format = AF_FORMAT_FLOAT_NE; - af->data->bps = 4; af->play = play_float; }// else { - af->data->format = AF_FORMAT_S16_NE; - af->data->bps = 2; + mp_audio_set_format(af->data, AF_FORMAT_S16_NE); af->play = play_s16; } @@ -69,12 +66,6 @@ static int control(struct af_instance* af, int cmd, void* arg) s->mul = f; return AF_OK; } - case AF_CONTROL_ES_MUL | AF_CONTROL_SET: - s->mul = *(float*)arg; - return AF_OK; - case AF_CONTROL_ES_MUL | AF_CONTROL_GET: - *(float*)arg = s->mul; - return AF_OK; } return AF_UNKNOWN; } |