diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2015-11-10 18:45:08 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2015-11-10 18:45:08 +0100 |
| commit | 273607c1c6f77859e9a0cb98c3e4c74bc354fd8d (patch) | |
| tree | 0fbd329857356bddf1d4dfbcf09ca4fbe2d6f0f9 /stream/ai_alsa1x.c | |
| parent | 5b7d0fbab31cb70d05bb7f757283c1ee4028b091 (diff) | |
| parent | fee45c01703ace0d6af7b8fe60d151be245a0e3f (diff) | |
| download | mpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.bz2 mpv-273607c1c6f77859e9a0cb98c3e4c74bc354fd8d.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'stream/ai_alsa1x.c')
| -rw-r--r-- | stream/ai_alsa1x.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c index c5dc84cfcc..8f2b774faf 100644 --- a/stream/ai_alsa1x.c +++ b/stream/ai_alsa1x.c @@ -134,7 +134,11 @@ int ai_alsa_init(audio_in_t *ai) { int err; - err = snd_pcm_open(&ai->alsa.handle, ai->alsa.device, SND_PCM_STREAM_CAPTURE, 0); + const char *device = ai->alsa.device; + if (!device) + device = "default"; + + err = snd_pcm_open(&ai->alsa.handle, device, SND_PCM_STREAM_CAPTURE, 0); if (err < 0) { MP_ERR(ai, "Error opening audio: %s\n", snd_strerror(err)); return -1; |