wm4 1aa2e36122 Merge remote-tracking branch 'origin/master' ... Conflicts: bstr.c bstr.h etc/input.conf input/input.c input/input.h libao2/ao_pulse.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c libvo/gl_common.c libvo/x11_common.c mixer.c mixer.h mplayer.c		2012-04-01 22:52:33 +02:00
..
ass_mp.c	ass_mp.c: remove code duplication	2012-03-06 20:01:40 +01:00
ass_mp.h	options: move libass-related options to struct	2011-09-03 14:26:14 +03:00
av_sub.c	Update Libav API uses	2012-02-01 22:46:27 +02:00
av_sub.h
dec_sub.c
dec_sub.h
find_sub.c
find_subfiles.c	windows support: unicode filenames	2012-03-09 20:48:54 +02:00
find_subfiles.h	subs: options: add -sub-paths	2011-04-20 04:22:52 +03:00
font_load_ft.c	cleanup: shut up more warnings	2011-05-06 18:33:16 +03:00
font_load.c	windows support: unicode filenames	2012-03-09 20:48:54 +02:00
font_load.h
osd_font.h
sd_ass.c	sd_ass.c: set event->Style to fix --ass-styles	2011-09-23 13:57:11 +03:00
sd.h
spudec.c	build: switch to libavutil bswap.h and intreadwrite.h	2012-02-01 22:46:27 +02:00
spudec.h
sub_cc.c
sub_cc.h
sub.c	core: allocate OSD text buffers dynamically	2011-08-09 03:28:58 +03:00
sub.h	timeline: subs: keep subtitle tracks in source time	2012-03-25 22:30:37 +03:00
subassconvert.c	subassconvert: handle "\r\n" line ends	2011-09-02 12:22:15 +03:00
subassconvert.h
subreader.c	Fix minor memory leak from 2003	2012-02-25 17:52:34 +01:00
subreader.h	find_subfiles: move sub_filenames() here	2011-04-20 04:22:52 +03:00
unrar_exec.c
unrar_exec.h
vobsub.c	cleanup: Silence compilation warnings on MinGW-w64	2012-03-01 00:22:30 +02:00
vobsub.h	options: change -alang and -slang to use string list type	2011-04-20 04:22:42 +03:00