1
0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
mpv/libass
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +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 r27441 2008-08-08 02:13:09 +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 Rename font-related preprocessor directives. 2008-08-07 10:36:07 +00:00
ass.h Speak of libass instead of MPlayer in the libass license headers. 2008-05-14 17:21:58 +00:00
mputils.h Speak of libass instead of MPlayer in the libass license headers. 2008-05-14 17:21:58 +00:00