wm4 97ac824124 Merge remote-tracking branch 'origin/master' ... Conflicts: bstr.c bstr.h libvo/cocoa_common.m libvo/gl_common.c libvo/video_out.c mplayer.c screenshot.c sub/subassconvert.c Merge of cocoa_common.m done by pigoz. Picking my version of screenshot.c. The fix in commit aadf1002f8 will be redone in a follow-up commit, as the original commit causes too many conflicts with the work done locally in this branch, and other work in progress.		2012-04-29 10:01:28 +02:00
..
ass_mp.c	Merge remote-tracking branch 'origin/master'	2012-04-28 00:54:26 +02: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
font_load_ft.c
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: make subrip attribute parsing more robust	2012-04-17 02:43:15 +03:00
subassconvert.h
subreader.c	Fix minor memory leak from 2003	2012-02-25 17:52:34 +01:00
subreader.h
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