1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-19 18:05:21 +00:00
mpv/libao2
Uoti Urpala d5c868325c Merge svn changes up to r26979
Most of the conflicts are trivial.

Conflicts:

	Makefile
	cfg-mplayer.h
	input/input.c
	libmenu/vf_menu.c
	libmpcodecs/dec_video.c
	libmpcodecs/vf_expand.c
	libmpcodecs/vf_vo.c
	libmpdemux/demux_mkv.c
	libmpdemux/demuxer.c
	libmpdemux/demuxer.h
	libvo/vo_directfb2.c
	libvo/vo_gl.c
	libvo/vo_winvidix.c
	libvo/vo_xv.c
	libvo/vo_xvidix.c
	libvo/vo_xvmc.c
	libvo/x11_common.c
	mplayer.c
	osdep/timer-linux.c
	stream/cache2.c
2008-06-04 08:10:48 +03:00
..
ao_alsa5.c cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:31:55 +00:00
ao_alsa.c cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:31:55 +00:00
ao_arts.c cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:31:55 +00:00
ao_dsound.c Use standard license headers with standard formatting. 2008-05-14 18:02:27 +00:00
ao_dxr2.c Write functions used by send_mpeg_*_packet may _not_ modify data 2008-01-12 16:05:04 +00:00
ao_esd.c Remove unused variables, patch by Stefan Huehner, stefan ##at## huehner org. 2006-07-09 16:01:36 +00:00
ao_ivtv.c Use standard license headers with standard formatting. 2008-05-14 18:02:27 +00:00
ao_jack.c Make code slightly less confusing to me 2008-01-11 20:55:08 +00:00
ao_macosx.c Grammar fix. 2007-12-22 18:12:03 +00:00
ao_mpegpes.c typo fix: inited --> initialized 2008-02-14 14:23:55 +00:00
ao_nas.c ISO8859-1 --> UTF-8 2007-07-09 19:50:36 +00:00
ao_null.c Fix ao_null with float samples 2007-12-01 05:17:08 +00:00
ao_openal.c Remove unused variable. 2008-01-30 23:49:36 +00:00
ao_oss.c Somewhat hackish fix for A-V desync with ao_oss and frame stepping: 2007-07-19 19:15:59 +00:00
ao_pcm.c Remove a comment that makes no longer sense (since quite some time actually) 2008-05-01 16:59:37 +00:00
ao_pulse.c Use standard license headers with standard formatting. 2008-05-14 18:02:27 +00:00
ao_sdl.c cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:31:55 +00:00
ao_sgi.c cosmetics: misc typo fixes 2007-09-25 16:34:23 +00:00
ao_sun.c reset() should not senselessly close and reopen 2008-04-07 17:39:41 +00:00
ao_v4l2.c Use standard license headers with standard formatting. 2008-05-14 18:02:27 +00:00
ao_win32.c Use standard license headers with standard formatting. 2008-05-14 18:02:27 +00:00
audio_out_internal.h Add MPLAYER_ prefix to multiple inclusion guards. 2008-02-22 09:09:46 +00:00
audio_out.c Introduce a separate definition for Mac OS X coreaudio support. 2008-03-15 08:54:21 +00:00
audio_out.h Remove _s/_st suffix from some struct names 2008-04-25 03:34:22 +03:00