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

..

mirrors

typo: begining --> beginning

2007-12-23 21:22:02 +00:00

realcodecs

…

binary-packaging.txt

Allow shared libavcodec, but explain the implications.

2006-09-19 00:08:18 +00:00

code-documentation.txt

random small fixes

2007-02-14 23:44:01 +00:00

codec-devel.txt

clarify comments/docs about lav* being the preferred place to implement new

2008-01-28 22:09:21 +00:00

codecs-in.html

Fix stylesheet path.

2006-02-21 21:54:08 +00:00

codecs.conf.txt

its typo spotted by diego

2008-05-14 17:28:50 +00:00

colorspaces.txt

Add a practical description of endian-independent RGB/BGR coding

2006-02-24 22:18:45 +00:00

Doxyfile

…

dr-methods.txt

spellfix

2006-12-29 13:26:48 +00:00

dvdnav-howto.txt

warn to always disable the internal dvdread; still menus are supported now

2008-05-31 12:51:38 +00:00

encoding-guide.txt

Change spelling of XviD to Xvid as has already been done in the (rest of the)

2008-05-31 16:38:02 +00:00

encoding-tips.txt

Change spelling of XviD to Xvid as has already been done in the (rest of the)

2008-05-31 16:38:02 +00:00

formats.txt

typo: begining --> beginning

2007-12-23 21:22:02 +00:00

general.txt

cosmetics: typo fixes, usefuLL --> useful and aswell --> as well

2007-02-22 00:18:10 +00:00

hwac3.txt

cosmetics: Fix some common typos, appropiate --> appropRiate,

2007-02-24 10:27:14 +00:00

libao2.txt

Update libao2 description, delete completely outdated "audio plugins" part

2006-11-14 05:03:47 +00:00

libmpcodecs.txt

Remove _s/_st suffix from some struct names

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

libvo.txt

typo fix (s/M/N/) in IMPORTA_M_T

2007-04-04 12:38:08 +00:00

MAINTAINERS

Change spelling of XviD to Xvid as has already been done in the (rest of the)

2008-05-31 16:38:02 +00:00

manpage.txt

Add a backslash.

2007-10-30 22:35:42 +00:00

mpdsf.txt

cosmetics: misc typo fixes

2007-09-25 16:34:23 +00:00

mpsub.sub

…

new_policy_proposal.txt

update password-gpg rule from ffmpeg

2007-03-15 12:55:35 +00:00

nut.txt

more sensless repo moving ..moving ...

2007-05-24 11:53:58 +00:00

oggless-xiph-codecs.txt

more sensless repo moving ..moving ...

2007-05-24 11:53:58 +00:00

osd.txt

spelling/grammar/wording

2005-10-23 14:49:32 +00:00

patches.txt

Explain how to use diff -uwbBE with svn directly

2007-09-18 08:36:30 +00:00

playtree

typo: begining --> beginning

2007-12-23 21:22:02 +00:00

release-howto.txt

More fixes by The Wanderer

2005-04-20 22:07:08 +00:00

slave.txt

Add a slave command to stop stream playback.

2008-05-27 18:39:57 +00:00

snow.txt

A couple typos: whith --> with, Defult --> Default

2006-06-05 06:36:21 +00:00

subcp.txt

…

svn-howto.txt

mphq2 runs svn 1.4.x.

2008-06-04 00:48:24 +00:00

swscaler_filters.txt

cosmetics: typo fixes, usefuLL --> useful and aswell --> as well

2007-02-22 00:18:10 +00:00

swscaler_methods.txt

More typos. One noticed by Nico. Added an empty line at the end to make syncmail happy

2005-08-23 16:22:13 +00:00

TODO

10l to me for bad todo items

2007-02-24 20:01:08 +00:00

translations.txt

Add paragraph about homepage translation.

2008-05-08 00:14:18 +00:00

vidix.txt

…

wishlist

add switch_aspect cycle wish

2008-04-04 01:24:40 +00:00