diff options
| author | wm4 <wm4@nowhere> | 2013-09-20 13:48:36 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-09-20 13:48:36 +0200 |
| commit | 3e5b632559a9198c0ede739622529d8df7909ca7 (patch) | |
| tree | 0b66c871c6b670313da1dcedb9582db2a856cf51 /audio/out | |
| parent | ed2d67b6d7585a5db5411f230fc8dcd27f9e85fc (diff) | |
| parent | 542086dd4537b852b61974f9bee4eabebde8505f (diff) | |
| download | mpv-3e5b632559a9198c0ede739622529d8df7909ca7.tar.bz2 mpv-3e5b632559a9198c0ede739622529d8df7909ca7.tar.xz | |
Merge branch 'volume_restore'
Diffstat (limited to 'audio/out')
| -rw-r--r-- | audio/out/ao_alsa.c | 1 | ||||
| -rw-r--r-- | audio/out/ao_oss.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 2db5041b95..ff931e2a0b 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -38,7 +38,6 @@ #include "config.h" #include "mpvcore/options.h" #include "mpvcore/m_option.h" -#include "audio/mixer.h" #include "mpvcore/mp_msg.h" #define ALSA_PCM_NEW_HW_PARAMS_API diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index 79b96c7bc1..0890f11e0a 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -36,7 +36,6 @@ #include "config.h" #include "mpvcore/options.h" #include "mpvcore/mp_msg.h" -#include "audio/mixer.h" #ifdef HAVE_SYS_SOUNDCARD_H #include <sys/soundcard.h> |