RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 12:25:03 +00:00
Code Issues Releases Wiki Activity
7,984 Commits 41 Branches 86 Tags 133 MiB
d200725e88
Commit Graph

75 Commits

Author SHA1 Message Date
arpi
d200725e88 This patch is to add support for overlapping subtitles, that is 
subtitles whose start or end happens during another subtitle.
After reading the subtitles from the file in sub_read_file(),
this patch looks for overlapping subtitles and split
them into more non-overlapping subtitles.

Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7984 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-10-30 19:26:05 +00:00
arpi
b364822847 JACOSub is another subtitling format, whose specifications are at: 
http://unicorn.us.com/jacosub
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7983 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-10-30 19:16:58 +00:00
arpi
4293eebe30 small memleaks 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7776 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-10-17 00:53:14 +00:00
atmos4
ff72be050b Enable -subfps for time based subtitles, too. 
Please update the DOCS for -subfps:
"If you have time-based subtitles like subviewer that can't be synced by -subdelay
try specifying -subfps with the framerate of the movie the time-based sub was
created for, eg. -subfps 25 if you use subs from a 25 fps movie with a movie
using a different framerate. If you need to guess -subfps, try 25, 23.98 and 29.97"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7611 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-10-06 02:59:04 +00:00
atmos4
d803db3e15 Skip html tags (like <i>) inside subviewer subtitles. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7609 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-10-06 00:46:47 +00:00
arpi
d483a015a2 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-09-22 02:33:28 +00:00
kmkaplan
5f9adff3f6 New option for mplayer: -dumpmicrodvdsub 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7461 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-09-21 17:23:46 +00:00
nexus
af4654d926 FreeBSD iconv change/fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7129 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-08-28 23:00:25 +00:00
kmkaplan
86be4b3562 Correct dump_srt millisecond output 
Add support for input from frame based subtitles to dump_srt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6793 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-07-25 18:05:08 +00:00
arpi
146376549d subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor <dolphy@inf.elte.hu> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6658 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-07-06 15:19:08 +00:00
alex
c282ad5a4c support for SSA v4 by Dirk <noisyb at gmx.net> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6598 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-06-29 10:39:58 +00:00
arpi
f1748e040e msg/i18n fixes and some printf->mp_msg 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6297 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-06-03 23:23:03 +00:00
arpi
e8235b8140 sub_read_line_ssa sig11 fix by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz> 
when this function encounters a multiline subtitle with more lines than
SUB_MAX_TEXT, this stupid bug manifests. The function actually reads one
line less than the returned count. Subsequently, either during iconv or
during playing a null pointer gets referenced, with obvious result.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6248 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-05-31 21:48:36 +00:00
arpi
c04588fedf possible sig11 fixed in .rt parser (weisskreuzova.zip) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6243 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-05-30 17:44:58 +00:00
iive
1eb8577aa5 added dump subtitles to .srt 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6209 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-05-27 17:20:55 +00:00
alex
cdfc03fab6 applied 64bit patch from Ulrich Hecht <uli at suse dot de> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6164 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-05-23 15:27:49 +00:00
arpi
6fe43d0d87 patch fixes broken detecniou of AQTitle subtiles and adds support for subtitles created by subrip 0.9 - by Jiri.Svoboda@seznam.cz 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6077 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-05-13 20:41:20 +00:00
pl
8a99b7a507 patch by Didier <did-c-debian@ifrance.com>: 
- subviewer 2.0 support


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6013 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-05-07 21:58:01 +00:00
arpi
8c740ea4f8 accept \N too, patch by Reinder <r.cuperus@student.utwente.nl> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5991 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-05-05 21:33:13 +00:00
arpi
2bb2db0a65 frame-based mpsub parser fix - patch by Rizsanyi Zsolt <rizsanyi@myrealbox.com> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5829 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-04-25 12:59:24 +00:00
arpi
cfa148bdb8 vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5364 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-03-27 01:22:11 +00:00
laaz
e0acf7f92c -subfps and -subdelay alters -dumpmpsub's output 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4887 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-02-28 02:37:13 +00:00
laaz
77f3ac91e6 Fixed a bug with -dumpmpsub 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4881 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-02-28 01:01:50 +00:00
eyck
094cd24bf4 too many arguments to sscan in subdetect. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4520 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-02-03 19:17:22 +00:00
eyck
cff3abbe48 detect microdvd with empty second frame. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4445 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-01-31 12:03:49 +00:00
laaz
7bc932abc8 fixed mpsub bug requested by Gabucino 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4099 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-01-12 00:02:52 +00:00
atlka
d136021db3 1. subs know are readed after reading AVI header so we already know fps 
2. modified vplayer format reader - default time is ~6 sec - maybe that should
be an option


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4065 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-01-09 16:35:24 +00:00
atlka
61bcfde0a0 corrections to adjust_subs_time function which now uses fps if needed 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4053 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-01-08 14:10:22 +00:00
atlka
723e6e76b3 added adjust_subs_time function which corrects bad sub->end time 
after reading subs so it is sub format independent


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4052 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-01-08 12:45:38 +00:00
atlka
8da82b8b0e changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" too 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4049 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-01-08 11:03:43 +00:00
arpi
5b7e3a9724 tail_space infinite loop fix by jeon_goon@lycos.co.kr 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3925 b3059339-0415-0410-9bf9-f77b7e298cf2
 2002-01-01 01:11:31 +00:00
pl
41e2ff053f fix a warning (ambiguous 'if else') 
fix a would be bug (separator)
small warning fixes


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3736 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-12-25 16:41:06 +00:00
eyck
45ff92c257 vplayer format - no longer crashes on slightly broken subs. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3725 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-12-25 01:32:04 +00:00
pl
78a2f98144 bzero() -> memset() 
malloc()+strcpy() -> strdup()
trail_space() slightly changed


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3702 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-12-24 10:39:28 +00:00
pontscho
cf33c343cf some small sub bug fix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3544 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-12-17 00:07:20 +00:00
atmos4
6dccfe832a Patch by artur Zaprzala: 
This patch adds test for NULL return value of strchr().


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3434 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-12-10 14:48:02 +00:00
arpi
69bc5817db patch fixes the showing last line of subtitles and support of SAMI Slacktime option by Evgeny Chukreev <codedj@echo.ru> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3236 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-11-30 23:45:48 +00:00
iive
7c2f90829e fopen(NULL,r) segfault on qnx 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2916 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-11-15 16:46:52 +00:00
pl
e107700e17 minor cleanups: 
a few #define's in subreader.h are now used instead of -1..9
  same thing for line length instead of 1000..1001
  renamed *_third() to *_subviewer() since it is what it is


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2913 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-11-15 11:53:11 +00:00
arpi
01934100b7 11110001.txt find_sub sig11 fixed 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2881 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-11-13 21:18:25 +00:00
atmos4
ee898ac2f9 Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru> 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2837 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-11-11 15:41:17 +00:00
laaz
c207d215f6 mpsub, FORMAT=<frame> alpha version 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2496 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-10-26 22:14:19 +00:00
atlka
ee42dc0d10 remowing warning message 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2469 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-10-25 13:46:14 +00:00
atlka
a8ef3eac6d added DUMPSUBS recognition if we need compile only subreader.c alone 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2450 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-10-24 13:57:46 +00:00
nexus
43e4f2c792 better FreeBSD iconv implementation 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2359 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-10-22 07:43:32 +00:00
arpi
16dc387ec2 AQT type support patch by Jiri.Svoboda@seznam.cz 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2344 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-10-21 17:19:59 +00:00
laaz
987514c601 MPsub read/write support 0.5 (-dumpmpsub switch) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2179 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-10-12 16:21:55 +00:00
laaz
a30a8a7365 mpsub read support 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2178 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-10-12 13:51:58 +00:00
atlka
0a5c47a028 modifications to use iconv(3) function to recode text of subs (autodetect) 
added option -subcp <cpname> # for example cp1250, latin2 etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2152 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-10-10 13:07:42 +00:00
laaz
516a27f670 SSA 2. felvonas (egyre jobban programozok!!!) 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2142 b3059339-0415-0410-9bf9-f77b7e298cf2
 2001-10-09 00:36:55 +00:00