diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
| commit | 5d74fa7dc0fa1617d1d11b69769423b1387ec785 (patch) | |
| tree | 882752015b3500c91b8ab3a4d669696f23feb817 /audio/out/ao_oss.c | |
| parent | c226bc7616ab2ae9de6172660e9cf727f07dc374 (diff) | |
| parent | a2fa0d0b68ce200598122145254f56ae1adff91e (diff) | |
| download | mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.bz2 mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/out/ao_oss.c')
| -rw-r--r-- | audio/out/ao_oss.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index 90d3b3e5c5..5bf5fec29b 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -648,9 +648,10 @@ const struct ao_driver audio_out_oss = { .oss_mixer_device = PATH_DEV_MIXER, }, .options = (const struct m_option[]) { - OPT_STRING("device", dsp, 0), + OPT_STRING("device", dsp, 0, DEVICE_OPT_DEPRECATION), OPT_STRING("mixer-device", oss_mixer_device, 0), OPT_STRING("mixer-channel", cfg_oss_mixer_channel, 0), {0} }, + .legacy_prefix = "oss", }; |