summaryrefslogtreecommitdiffstats
path: root/sub
Commit message (Expand)AuthorAgeFilesLines
* clang: fix all warnings except deprecationsStefano Pigozzi2012-11-131-1/+1
* Rename directories, move files (step 2 of 2)wm42012-11-1214-46/+43
* Merge branch 'osd_changes' into masterwm42012-11-0118-1447/+1282
|\
| * draw_bmp: remove swscale bug workaroundwm42012-11-011-3/+1
| * screenshot, draw_bmp: use colorspace passed with mp_imagewm42012-11-014-35/+53
| * csputils: better support for integer color valueswm42012-10-282-2/+6
| * draw_bmp, csputils: use function instead of macrowm42012-10-282-24/+7
| * draw_bmp: cosmetics, refactorwm42012-10-283-434/+332
| * draw_bmp: remove CONDITIONAL2 codewm42012-10-241-25/+0
| * Merge branch 'master' into osd_changeswm42012-10-241-2/+2
| |\
| * | options: remove --ffactor switchwm42012-10-244-11/+2
| * | options: remove --subfont-autoscale (changes default font scale)wm42012-10-244-31/+2
| * | options: remove subtitle related options that did nothingwm42012-10-244-24/+5
| * | draw_bmp: fix IMGFMT_BGR32 useRudolf Polzer2012-10-241-9/+15
| * | sub: add clarifying commentswm42012-10-241-1/+3
| * | draw_bmp: fix for yuy2 formatwm42012-10-241-1/+2
| * | sub: simplify OSD redrawing logicwm42012-10-242-17/+3
| * | VO, sub: refactorwm42012-10-2412-125/+70
| * | draw_bmp: don't try to call swscale if image format not supportedwm42012-10-241-0/+3
| * | sub: add cache to mp_draw_sub_bitmaps()wm42012-10-244-19/+86
| * | sub, vf_ass: allow rendering RGBA subs, replace old vf_ass renderingwm42012-10-242-69/+70
| * | sub: fix text subtitle aspect ratio with vo_xv and vo_lavc, refactorwm42012-10-245-8/+8
| * | spudec: use csputils for color conversionwm42012-10-241-10/+8
| * | Remove things related to old OSDwm42012-10-246-1066/+1
| * | img_convert: fix alignment for RGBA imageswm42012-10-241-3/+8
| * | sub: add function to draw OSD into an imagewm42012-10-242-0/+31
| * | draw_bmp: compensate for libswscale writing past image boundswm42012-10-241-1/+2
| * | sub: add helper to draw sub-bitmaps into an imageRudolf Polzer2012-10-242-0/+592
| * | Merge branch 'master' into osd_changeswm42012-10-163-18/+34
| |\ \
| * | | sub: fix and simplify some change detection detailswm42012-10-163-15/+14
| * | | spudec.c: crop subs, set scaled flagwm42012-10-161-30/+84
| * | | sub: switch to premultiplied alphawm42012-10-162-5/+21
| * | | sub: never decode subs to old OSD formatwm42012-10-169-169/+191
| * | | sub: cosmetics: move things aroundwm42012-10-166-63/+70
| * | | sub: cleanup: don't pass parameters via global variableswm42012-10-167-42/+38
| * | | sub: always go through sub.c for OSD renderingwm42012-10-163-10/+102
| * | | sub, VO: remove vo_osd_resized() functionwm42012-10-162-9/+0
| * | | sub: remove logic for disabling hinting on scaled EOSDwm42012-10-164-8/+4
| * | | sub: make it easier to set DVD sub decoding with sd_lavcwm42012-10-162-8/+23
| * | | osd_libass: set RTL base direction to neutralwm42012-10-161-3/+6
| * | | sub: cleanup: remove vo_osd_probar_type/value global variableswm42012-10-163-12/+9
| * | | sub: cosmetics: turn some defines into enumswm42012-10-162-28/+34
| * | | sub: allow converting DVD subs to RGBAwm42012-10-164-6/+53
| * | | sub: allow rendering OSD in ASS image format directly, simplifywm42012-10-1612-522/+593
| * | | sub: add preliminary emulation layer to draw OSD with EOSDwm42012-10-162-0/+82
| * | | sub: create sub_bitmap array even when using libasswm42012-10-164-18/+67
* | | | subreader: do not write outside array boundsreimar2012-10-311-2/+4
* | | | spudec: set pointers to NULL after freereimar2012-10-311-0/+2
| |_|/ |/| |
* | | osd_libass: increase robustness when handling internal OSD escapeswm42012-10-221-1/+1
* | | osd_libass: fix stupid dangling pointer crashwm42012-10-221-1/+1
| |/ |/|
* | osd_libass: fix \n escapeswm42012-10-141-8/+3
* | sub: add --ass-style-override option to disable style overrideswm42012-10-122-13/+29
* | sub: enable sub-pos with libasswm42012-10-122-1/+6
|/
* subs, vo_vdpau: support RGBA color for PGS subtitlesUoti Urpala2012-09-185-12/+143
* options: remove -subalignwm42012-09-182-2/+0
* subs: restore support for sub_step command with libasswm42012-09-182-0/+14
* subs, vo: do sub bitmap change detection by comparing IDsUoti Urpala2012-09-184-9/+22
* subs: always use sub decoder framework for libass renderingUoti Urpala2012-09-188-27/+98
* subs: libass: use a single persistent renderer for subtitlesUoti Urpala2012-09-185-26/+25
* sd_lavc: use subtitle framework for former av_sub.c codeUoti Urpala2012-09-185-94/+72
* core: manage tracks in the frontendwm42012-09-183-1/+8
* osd_libass: fix displaying empty text, fix API usagewm42012-08-211-11/+6
* Adjust ffmpeg/libav #includes to work with recent upstream changesUoti Urpala2012-08-211-1/+1
* osd: get rid of useless initialization functionwm42012-08-201-9/+1
* sub: remove unused definitionswm42012-08-201-12/+0
* Remove dvdnav support (DVD menus)wm42012-08-162-68/+0
* sub: fix confusion of ass_library handleswm42012-08-073-11/+14
* osd_libass: allocate separate ASS_Library for OSDwm42012-08-073-5/+9
* osd: reset OSD change state even if VO doesn't draw OSDwm42012-08-072-0/+10
* VO: remove old VO gluewm42012-08-073-18/+2
* osd: free buffer allocated with av_malloc with av_freewm42012-08-041-4/+4
* sub: simplify code by always defining sub_cpwm42012-08-032-5/+3
* subassconvert: order colour names alphabetically / better match W3 listmplayer-svn2012-08-031-7/+23
* spudec: use more precise alpha handling for -spuaa 4mplayer-svn2012-08-031-2/+2
* av_sub, spudec: support multiple rectanglesmplayer-svn2012-08-033-41/+113
* subreader: eliminate duplicate subtitle linesmplayer-svn2012-08-031-0/+10
* subreader: SSA reader: do not strip commas in commandsmplayer-svn2012-08-031-0/+3
* subreader: fix reading of aqr/subrip09 subtitlesmplayer-svn2012-08-031-8/+8
* subreader: get rid of some code duplicationmplayer-svn2012-08-031-64/+34
* Remove teletext supportwm42012-08-034-31/+0
* osd: minor simplification of vo_osd_changed()wm42012-08-012-11/+20
* Remove dead codewm42012-08-0110-986/+0
* configure: remove checks for malloc.h and alloca()wm42012-07-301-3/+0
* configure: remove memalign checkwm42012-07-301-3/+5
* ass_mp.c: remap libass log levelswm42012-07-301-0/+12
* sub: silence output of subtitle search messagewm42012-07-301-1/+1
* sub: remove unrar_execwm42012-07-303-466/+0
* bstr: rename bstr() function to bstr0(), and typedef bstr to struct bstrwm42012-07-282-15/+15
* osd: osd_font.h -> osd_font.pfbwm42012-07-283-546/+3
* osd: remove freetype font rendering codewm42012-07-2810-2703/+52
* osd: use libass for OSD renderingwm42012-07-2810-970/+1440
* osd: enable line breaking for OSD textwm42012-07-281-31/+67
* Merge remote-tracking branch 'origin/master'wm42012-05-201-1/+1
|\
| * font_load_ft.c: fix possible crash with recent FontconfigUoti Urpala2012-05-171-1/+1
* | Merge remote-tracking branch 'origin/master'wm42012-04-291-33/+34
|\ \ | |/
| * subassconvert: make subrip attribute parsing more robustUoti Urpala2012-04-171-33/+34
| * subassconvert: handle unquoted attributes in subrip font tagswm42012-04-171-27/+45
* | Merge remote-tracking branch 'origin/master'wm42012-04-281-1/+6
|\ \ | |/
| * subs: only use "subfont.ttf" as libass fallback if it existsUoti Urpala2012-04-141-1/+6
* | subassconvert: handle unquoted attributes in subrip font tagswm42012-04-161-27/+45
* | Merge remote-tracking branch 'origin/master'wm42012-04-011-0/+1
|\ \ | |/
| * timeline: subs: keep subtitle tracks in source timeUoti Urpala2012-03-251-0/+1
* | Merge remote-tracking branch 'origin/master' into my_masterwm42012-03-163-10/+6
|\ \ | |/
| * windows support: unicode filenameswm42012-03-092-8/+4
| * cleanup: Silence compilation warnings on MinGW-w64wm42012-03-011-2/+2
* | ass_mp.c: remove code duplicationwm42012-03-061-2/+1
* | Merge remote-tracking branch 'origin/master' into my_masterwm42012-03-052-8/+15
|\ \ | |/
| * build: switch to libavutil bswap.h and intreadwrite.hUoti Urpala2012-02-011-6/+8
| * Update Libav API usesUoti Urpala2012-02-011-2/+7
* | Fix minor memory leak from 2003wm42012-02-251-2/+8
|/
* configure, build: require at least Libav 0.7Uoti Urpala2011-12-221-2/+0
* core, vo: modify OSD redraw architecture, support EOSDUoti Urpala2011-12-061-0/+1
* subreader.c: don't run FriBiDi code if using libassUoti Urpala2011-09-231-1/+4
* sd_ass.c: set event->Style to fix --ass-stylesUoti Urpala2011-09-231-0/+1
* options: move libass-related options to structUoti Urpala2011-09-033-55/+33
* subassconvert: handle "\r\n" line endsClément Bœsch2011-09-021-1/+1
* aviheader.h: avoid including demuxer.hUoti Urpala2011-08-192-0/+2
* core: allocate OSD text buffers dynamicallyharklu2011-08-092-1/+11
* subs: libass: apply option changes to all track typesUoti Urpala2011-08-082-7/+2
* subs: libass: remove bad ass_set_margins() on settings resetUoti Urpala2011-08-081-1/+4
* cleanup: move global ass_force_reload to struct osd_stateUoti Urpala2011-08-083-14/+12
* bstr: rename BSTR() -> bstr()Uoti Urpala2011-07-271-13/+13
* subs: fix per-file --ass-force-styleUoti Urpala2011-07-232-3/+0
* cleanup: subs: remove global ass_library variableUoti Urpala2011-07-234-4/+3
* cleanup: do libav* initialization on startupUoti Urpala2011-07-181-2/+0
* cleanup: vobsub.c: simplify parsingcboesch2011-07-061-57/+10
* cosmetics: Fix typoscehoyos2011-07-061-4/+4
* subreader: SAMI subs: wrap line if neededreimar2011-06-291-0/+2
* sub/ass: use default style, not first style unconditionallyGrigori Goronzy2011-06-141-1/+2
* cleanup: shut up more warningsClément Bœsch2011-05-064-10/+11
* Merge branch 'mplayer1_changes'Uoti Urpala2011-05-021-0/+4
|\
| * sub/spudec: fix artefacts at right border of subtitlesreimar2011-05-021-0/+4
* | find_subfiles: fix unintended modification of global filenameUoti Urpala2011-04-281-1/+1
* | cleanup: avoid various GCC warningsClément Bœsch2011-04-201-1/+1
* | cleanup: find_subfiles.c: simplify (mainly using bstr)Uoti Urpala2011-04-201-156/+113
* | cleanup: find_subfiles.c: simplify declarations and allocationsClément Bœsch2011-04-201-36/+25
* | find_subfiles: select subtitle files matching -slangClément Bœsch2011-04-201-57/+59
* | find_subfiles: try to determine if a .sub file is text or vobsubClément Bœsch2011-04-201-0/+14
* | subs: options: add -sub-pathsClément Bœsch2011-04-202-5/+29
* | find_subfiles: allow subtitle search in multiple directoriesClément Bœsch2011-04-201-117/+103
* | subs: move vobsub loading logic down to find_subfiles.cUoti Urpala2011-04-202-0/+26
* | subs: move text sub loading logic down to find_subfiles.cClément Bœsch2011-04-202-2/+11
* | find_subfiles: move sub_filenames() hereClément Bœsch2011-04-204-283/+297
* | options: change -alang and -slang to use string list typeClément Bœsch2011-04-202-5/+7
* | stream.[ch], ass_mp: new stream function for whole-file readsUoti Urpala2011-03-031-34/+12
|/
* cleanup: remove some casts of memalign() return valuediego2011-02-151-2/+2
* Merge branch 'sub'Uoti Urpala2011-01-261-1/+1
* sub/OSD: move some related files to sub/Uoti Urpala2011-01-2622-1/+10677
* cleanup: rename ass_* functions to mp_ass_*Uoti Urpala2011-01-261-1/+1
* subs: use correct font aspect ratio for libass + converted subsUoti Urpala2011-01-261-0/+2
* sd_ass: remove subreader use, support plaintext markupUoti Urpala2011-01-181-12/+66
* subtitles: style support for common SubRip tags and MicroDVDUoti Urpala2011-01-182-0/+529
* subtitles: add framework for subtitle decodersUoti Urpala2011-01-184-0/+200