Uoti Urpala 8c144171bb Merge svn changes up to r28087 ...

Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h

2008-12-04 01:55:52 +02:00

..

ass_bitmap.c

Merge svn changes up to r27441

2008-08-08 02:13:09 +03:00

ass_bitmap.h

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00

ass_cache.c

cosmetics: Remove useless parentheses from return statements.

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

ass_cache.h

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00

ass_font.c

Rename font-related preprocessor directives.

2008-08-07 10:36:07 +00:00

ass_font.h

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00

ass_fontconfig.c

Consistently use NULL for pointers instead of 0.

2008-11-02 11:48:20 +00:00

ass_fontconfig.h

Rename font-related preprocessor directives.

2008-08-07 10:36:07 +00:00

ass_library.c

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00

ass_library.h

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00

ass_mp.c

Get rid of pointless 'extern' keywords.

2008-12-03 23:01:03 +00:00

ass_mp.h

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00

ass_render.c

Merge svn changes up to r27458

2008-08-12 15:03:34 +03:00

ass_types.h

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00

ass_utils.c

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00

ass_utils.h

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00

ass.c

libass: fix type mismatch between size parameter and the way it's used

2008-09-05 22:59:01 +00:00

ass.h

libass: fix type mismatch between size parameter and the way it's used

2008-09-05 22:59:01 +00:00

mputils.h

Speak of libass instead of MPlayer in the libass license headers.

2008-05-14 17:21:58 +00:00