1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 07:12:39 +00:00
mpv/libao2
wm4 87f4cafe9c Merge remote-tracking branch 'origin/master'
Conflicts:
	command.c
	libao2/ao_alsa.c
	libao2/ao_dsound.c
	libao2/ao_pulse.c
	libao2/audio_out.h
	mixer.c
	mixer.h
	mplayer.c

Replace my mixer changes with uau's implementation, which is based on
my code.
2012-04-28 00:54:26 +02:00
..
ao_alsa.c ao_alsa: support native mute control 2012-04-11 03:56:30 +03:00
ao_arts.c
ao_coreaudio.c ao_coreaudio: fix partial volume control 2012-04-11 03:56:30 +03:00
ao_dsound.c audio: restore volume setting after AO reinit if needed 2012-04-11 03:50:31 +03:00
ao_esd.c audio: restore volume setting after AO reinit if needed 2012-04-11 03:50:31 +03:00
ao_ivtv.c audio: export audio pts to AO drivers 2011-07-31 16:31:07 +03:00
ao_jack.c
ao_mpegpes.c audio: export audio pts to AO drivers 2011-07-31 16:31:07 +03:00
ao_nas.c audio: restore volume setting after AO reinit if needed 2012-04-11 03:50:31 +03:00
ao_null.c ao_null: convert to new API, cleanup/rewrite 2011-05-05 04:45:44 +03:00
ao_openal.c ao_openal: fix crash when no device parameter is passed 2012-04-25 02:20:37 +02:00
ao_oss.c libao2: change control() types to enum, remove unused ones 2012-04-08 16:35:09 +03:00
ao_pcm.c ao_pcm: fix pointless message due to uninitialize variable 2011-08-11 20:58:05 +03:00
ao_pulse.c ao_pulse: support native mute control 2012-04-11 03:56:30 +03:00
ao_rsound.c ao_rsound: add new RSound audio output driver 2011-06-26 06:19:42 +03:00
ao_sdl.c audio: restore volume setting after AO reinit if needed 2012-04-11 03:50:31 +03:00
ao_sgi.c libao2: change control() types to enum, remove unused ones 2012-04-08 16:35:09 +03:00
ao_sun.c libao2: change control() types to enum, remove unused ones 2012-04-08 16:35:09 +03:00
ao_v4l2.c audio: export audio pts to AO drivers 2011-07-31 16:31:07 +03:00
ao_win32.c
audio_out_internal.h options: move mixer.h options to struct 2012-03-20 14:51:32 +02:00
audio_out.c libao2: change control() types to enum, remove unused ones 2012-04-08 16:35:09 +03:00
audio_out.h mixer: support native audio driver mute 2012-04-11 03:56:28 +03:00