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

..

af_center.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_channels.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_comp.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_delay.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_dummy.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_equalizer.c

A/V sync: take audio filter buffers into account

2007-11-01 06:52:50 +00:00

af_export.c

af_export.c is only compiled if HAVE_SYS_MMAN_H is set, so using that

2008-03-10 19:12:29 +00:00

af_extrastereo.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_format_alaw.c

Fix multiple inclusion guards, identifiers starting with __ are reserved

2007-11-29 14:23:24 +00:00

af_format_ulaw.c

Fix multiple inclusion guards, identifiers starting with __ are reserved

2007-11-29 14:23:24 +00:00

af_format.c

Remove useless #include.

2008-04-09 18:20:22 +00:00

af_format.h

Replace silly check for config.h inclusion, just include it.

2008-02-24 23:44:35 +00:00

af_gate.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_hrtf.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_hrtf.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

af_karaoke.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_ladspa.c

Use standard license headers with standard formatting.

2008-05-14 17:24:10 +00:00

af_lavcac3enc.c

Use standard license headers with standard formatting.

2008-05-14 17:24:10 +00:00

af_lavcresample.c

Use standard license headers with standard formatting.

2008-05-14 17:24:10 +00:00

af_mp.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

af_pan.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_resample.c

A/V sync: take audio filter buffers into account

2007-11-01 06:52:50 +00:00

af_resample.h

This header should not have multiple inclusion guards, it is meant

2008-02-18 21:07:33 +00:00

af_scaletempo.c

Use standard license headers with standard formatting.

2008-05-14 17:24:10 +00:00

af_sinesuppress.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_sub.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_surround.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_sweep.c

Use standard license headers with standard formatting.

2008-05-14 17:24:10 +00:00

af_tools.c

Use quotes instead of angular brackets for local includes.

2008-04-09 18:02:05 +00:00

af_volnorm.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af_volume.c

libaf: change filter input/output ratio calculations

2007-11-01 06:52:01 +00:00

af.c

Add new audio filter for encoding multi-channel audio into ac3 at runtime.

2007-12-13 12:38:17 +00:00

af.h

Remove _s/_st suffix from some struct names

2008-04-25 03:34:22 +03:00

control.h

Add missing header #include to fix 'make checkheaders'.

2008-03-10 19:19:03 +00:00

dsp.h

Fix illegal identifier: Rename _ftype_t macro to FLOAT_TYPE.

2008-04-10 10:01:54 +00:00

equalizer.h

Add MPLAYER_ prefix to multiple inclusion guards.

2008-02-22 09:09:46 +00:00

filter.c

Fix illegal identifier: Rename _ftype_t macro to FLOAT_TYPE.

2008-04-10 10:01:54 +00:00

filter.h

Fix illegal identifier: Rename _ftype_t macro to FLOAT_TYPE.

2008-04-10 10:01:54 +00:00

format.c

Remove some pointless 'inline' qualifiers

2007-11-01 06:52:10 +00:00

reorder_ch.c

Use standard license headers with standard formatting.

2008-05-14 17:24:10 +00:00

reorder_ch.h

Use standard license headers with standard formatting.

2008-05-14 17:24:10 +00:00

window.c

cosmetics: Remove useless parentheses from return statements.

2008-05-16 09:42:28 +00:00

window.h

Fix illegal identifier: Rename _ftype_t macro to FLOAT_TYPE.

2008-04-10 10:01:54 +00:00