summaryrefslogtreecommitdiffstats
path: root/libao2/ao_alsa.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-19 00:29:24 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-19 00:29:24 +0200
commit71b25cca7644ab059393e9ee4682d79aab41ceba (patch)
treece2017db0a47e61b280ff41c00dccedae77fbd1d /libao2/ao_alsa.c
parenta3ab9e8e4649601281f78949e56b92755ae1142a (diff)
parentb8830753f103748e8faa630ba636c845263906ce (diff)
downloadmpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.bz2
mpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.xz
Merge svn changes up to r28162
Diffstat (limited to 'libao2/ao_alsa.c')
-rw-r--r--libao2/ao_alsa.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index fdaaac1551..1ea974f6c1 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -120,6 +120,9 @@ static int control(int cmd, void *arg)
long get_vol, set_vol;
float f_multi;
+ if(ao_data.format == AF_FORMAT_AC3)
+ return CONTROL_TRUE;
+
if(mixer_channel) {
char *test_mix_index;
@@ -138,9 +141,6 @@ static int control(int cmd, void *arg)
}
if(mixer_device) card = mixer_device;
- if(ao_data.format == AF_FORMAT_AC3)
- return CONTROL_TRUE;
-
//allocate simple id
snd_mixer_selem_id_alloca(&sid);