Uoti Urpala 259ea9d703 Merge svn changes up to r27573 ...

Conflicts:
	libmpcodecs/vd_ffmpeg.c

2008-09-10 23:59:08 +03: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

Rename font-related preprocessor directives.

2008-08-07 10:36:07 +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

Rename font-related preprocessor directives.

2008-08-07 10:36:07 +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