diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
commit | 1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch) | |
tree | c5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /libao2/audio_out.c | |
parent | f2864e9a072f53c38a04dd7c44392521777dc908 (diff) | |
parent | 86c9fb2e8930de031807513c9b93d47394d2d2fa (diff) | |
download | mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2 mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz |
Merge svn changes up to r29277
Diffstat (limited to 'libao2/audio_out.c')
-rw-r--r-- | libao2/audio_out.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 8c64abbb95..fe95ab192f 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -31,7 +31,7 @@ ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0}; char *ao_subdevice = NULL; extern const ao_functions_t audio_out_oss; -extern const ao_functions_t audio_out_macosx; +extern const ao_functions_t audio_out_coreaudio; extern const ao_functions_t audio_out_arts; extern const ao_functions_t audio_out_esd; extern const ao_functions_t audio_out_pulse; @@ -67,7 +67,7 @@ const ao_functions_t* const audio_out_drivers[] = &audio_out_dart, #endif #ifdef CONFIG_COREAUDIO - &audio_out_macosx, + &audio_out_coreaudio, #endif #ifdef CONFIG_OSS_AUDIO &audio_out_oss, |