diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 18:59:15 +0200 |
| commit | b0986b3760b0174be6a58e1754353102f3230c79 (patch) | |
| tree | 0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /libao2/ao_alsa.c | |
| parent | 5fc54a6caad5f24b993da2e282c896269a6abc49 (diff) | |
| parent | 23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff) | |
| download | mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2 mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz | |
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'libao2/ao_alsa.c')
| -rw-r--r-- | libao2/ao_alsa.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 49f4237604..6d30003187 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -553,7 +553,8 @@ static int init(int rate_hz, int channels, int format, int flags) } /* workaround for buggy rate plugin (should be fixed in ALSA 1.0.11) - prefer our own resampler */ + prefer our own resampler, since that allows users to choose the resampler, + even per file if desired */ #if SND_LIB_VERSION >= 0x010009 if ((err = snd_pcm_hw_params_set_rate_resample(alsa_handler, alsa_hwparams, 0)) < 0) |