diff options
| author | wm4 <wm4@nowhere> | 2013-11-15 21:25:05 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-15 21:25:05 +0100 |
| commit | 514c4547702a01adb6f9e6274c40a77c7c511339 (patch) | |
| tree | c307d2d60094521cee703cbe9510f0ff9037e96b /audio/out/ao_alsa.c | |
| parent | 2289a479b174efa062fab84a66075b49f27c804d (diff) | |
| download | mpv-514c4547702a01adb6f9e6274c40a77c7c511339.tar.bz2 mpv-514c4547702a01adb6f9e6274c40a77c7c511339.tar.xz | |
audio: drop "_NE"/"ne" suffix from audio formats
You get the native format by not appending any suffix to the format.
This change includes user-facing names, e.g. for the --format option.
Diffstat (limited to 'audio/out/ao_alsa.c')
| -rw-r--r-- | audio/out/ao_alsa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 86c813c143..a8df1c9f25 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -387,7 +387,7 @@ static int init(struct ao *ao) ao->channels.num); } else { device = select_chmap(ao); - if (strcmp(device, "default") != 0 && ao->format == AF_FORMAT_FLOAT_NE) + if (strcmp(device, "default") != 0 && ao->format == AF_FORMAT_FLOAT) { // hack - use the converter plugin (why the heck?) device = talloc_asprintf(ao, "plug:%s", device); @@ -435,7 +435,7 @@ static int init(struct ao *ao) p->alsa_fmt = find_alsa_format(ao->format); if (p->alsa_fmt == SND_PCM_FORMAT_UNKNOWN) { p->alsa_fmt = SND_PCM_FORMAT_S16; - ao->format = AF_FORMAT_S16_NE; + ao->format = AF_FORMAT_S16; } err = snd_pcm_hw_params_test_format(p->alsa, alsa_hwparams, p->alsa_fmt); |