aboutsummaryrefslogtreecommitdiffhomepage
path: root/subreader.c
Commit message (Collapse)AuthorAge
* bunkus: fixed a small bug with skipping "{...}" in ssa subsGravatar mosu2003-01-13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8941 b3059339-0415-0410-9bf9-f77b7e298cf2
* Overlapping subs are a feature mainly present in subtitlingGravatar arpi2003-01-10
| | | | | | | | | | | | | software formats, such as JACOsub and SSA. This patch enables them, by default, only with this formats; however the user can force both enabling and disabling overlapping subtitles by the mean of -overlapsub and -nooverlapsub options. The code itself should avoid all the 'jumping subtitles' problems reported by the users. patch by salvatore.falco@katamail.com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8883 b3059339-0415-0410-9bf9-f77b7e298cf2
* Since version 2.7 the file extension for JACOsub changed fromGravatar arpi2003-01-09
| | | | | | | | | | | | '.js' to '.jss', to avoid confusion with javascript. There is also a new format for list_sub_file output; however this is used only in debugging subtitles code, while disabled in real life use. patch by <salvatore.falco@katamail.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8863 b3059339-0415-0410-9bf9-f77b7e298cf2
* some subviewer versions uses : instead of . or ,Gravatar arpi2003-01-05
| | | | | | | reported by Nagy Gábor <ngabor79@index.hu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8790 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10lGravatar arpi2003-01-04
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8786 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10lGravatar arpi2003-01-03
| | | | | | | patch by Oskar Liljeblad <oskar@osk.mine.nu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8735 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for subviewer format using dots instead of commas:Gravatar arpi2002-12-29
| | | | | | | | 00:00:27.000 --> 00:00:28.300 patch by Oskar Liljeblad <oskar@osk.mine.nu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8644 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch adds a call to subcp_recode1(), so this subtitles too areGravatar arpi2002-12-28
| | | | | | | | processed through iconv(). Kresimir Kukulj madmax@iskon.hr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8619 b3059339-0415-0410-9bf9-f77b7e298cf2
* Attached is a small patch to fix a couple of problems I found when usingGravatar arpi2002-12-28
| | | | | | | | | | | | | | | | .SSA subtitle files: 1) A comma appears at the beggining of the text. From comments on the code this seems to be a delicated matter, so I just added a conditional to eliminate the comma if it is at the beggining of the string. 2) It looks like this format uses {*} for attributes, like {/fs36} to select "font size 36pt". These things becomes really annoying when displayed with the real text ;-), so I added a simple filter to collapse all the text enclosed with { and }. Salvador Eduardo Tropea <salvador@inti.gov.ar> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8603 b3059339-0415-0410-9bf9-f77b7e298cf2
* dump subtitles in SAMI formatGravatar arpi2002-12-05
| | | | | | | patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8364 b3059339-0415-0410-9bf9-f77b7e298cf2
* optional (compile-time switch) subtitles-sorting featureGravatar arpi2002-12-05
| | | | | | | patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8363 b3059339-0415-0410-9bf9-f77b7e298cf2
* overlapping subtitles support is now optional, can be disabled (-nooverlapsub)Gravatar arpi2002-12-05
| | | | | | | patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
* dump in JACOsub formatGravatar arpi2002-12-04
| | | | | | | patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8361 b3059339-0415-0410-9bf9-f77b7e298cf2
* I recently sent a patch for a new subtitles format, JACOsub. Since then IGravatar arpi2002-11-16
| | | | | | | | | found a better definition of jacosub standard, and this patch is the result. It supports timeresolutions changes and shifts. Salvatore Falco <sfalco@studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8208 b3059339-0415-0410-9bf9-f77b7e298cf2
* allow max 0.2s overlapping without splitting subsGravatar arpi2002-11-16
| | | | | | | patch by salvatore.falco@katamail.com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8207 b3059339-0415-0410-9bf9-f77b7e298cf2
* *HUGE* set of compiler warning fixes, unused variables removalGravatar arpi2002-11-06
| | | | | | | based on patch by Dominik Mierzejewski <dominik@rangers.eu.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch is to add support for overlapping subtitles, that isGravatar arpi2002-10-30
| | | | | | | | | | | | 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
* JACOSub is another subtitling format, whose specifications are at:Gravatar arpi2002-10-30
| | | | | | | | 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
* small memleaksGravatar arpi2002-10-17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7776 b3059339-0415-0410-9bf9-f77b7e298cf2
* Enable -subfps for time based subtitles, too.Gravatar atmos42002-10-06
| | | | | | | | | | | 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
* Skip html tags (like <i>) inside subviewer subtitles.Gravatar atmos42002-10-06
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7609 b3059339-0415-0410-9bf9-f77b7e298cf2
* tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bugGravatar arpi2002-09-22
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
* New option for mplayer: -dumpmicrodvdsubGravatar kmkaplan2002-09-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7461 b3059339-0415-0410-9bf9-f77b7e298cf2
* FreeBSD iconv change/fixGravatar nexus2002-08-28
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7129 b3059339-0415-0410-9bf9-f77b7e298cf2
* Correct dump_srt millisecond outputGravatar kmkaplan2002-07-25
| | | | | | | 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
* subrip sometimes uses pipe as newline separator - patch by MOLNAR Andor ↵Gravatar arpi2002-07-06
| | | | | | <dolphy@inf.elte.hu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6658 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for SSA v4 by Dirk <noisyb at gmx.net>Gravatar alex2002-06-29
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6598 b3059339-0415-0410-9bf9-f77b7e298cf2
* msg/i18n fixes and some printf->mp_msgGravatar arpi2002-06-03
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6297 b3059339-0415-0410-9bf9-f77b7e298cf2
* sub_read_line_ssa sig11 fix by Jindrich Makovicka ↵Gravatar arpi2002-05-31
| | | | | | | | | | | | <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
* possible sig11 fixed in .rt parser (weisskreuzova.zip)Gravatar arpi2002-05-30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6243 b3059339-0415-0410-9bf9-f77b7e298cf2
* added dump subtitles to .srtGravatar iive2002-05-27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6209 b3059339-0415-0410-9bf9-f77b7e298cf2
* applied 64bit patch from Ulrich Hecht <uli at suse dot de>Gravatar alex2002-05-23
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6164 b3059339-0415-0410-9bf9-f77b7e298cf2
* patch fixes broken detecniou of AQTitle subtiles and adds support for ↵Gravatar arpi2002-05-13
| | | | | | 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
* patch by Didier <did-c-debian@ifrance.com>:Gravatar pl2002-05-07
| | | | | | | - subviewer 2.0 support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6013 b3059339-0415-0410-9bf9-f77b7e298cf2
* accept \N too, patch by Reinder <r.cuperus@student.utwente.nl>Gravatar arpi2002-05-05
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5991 b3059339-0415-0410-9bf9-f77b7e298cf2
* frame-based mpsub parser fix - patch by Rizsanyi Zsolt <rizsanyi@myrealbox.com>Gravatar arpi2002-04-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5829 b3059339-0415-0410-9bf9-f77b7e298cf2
* vplayer sub fix by Arkadiusz Podgorski <wodzu@softomat.com.pl>Gravatar arpi2002-03-27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5364 b3059339-0415-0410-9bf9-f77b7e298cf2
* -subfps and -subdelay alters -dumpmpsub's outputGravatar laaz2002-02-28
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4887 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixed a bug with -dumpmpsubGravatar laaz2002-02-28
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4881 b3059339-0415-0410-9bf9-f77b7e298cf2
* too many arguments to sscan in subdetect.Gravatar eyck2002-02-03
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4520 b3059339-0415-0410-9bf9-f77b7e298cf2
* detect microdvd with empty second frame.Gravatar eyck2002-01-31
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4445 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed mpsub bug requested by GabucinoGravatar laaz2002-01-12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4099 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. subs know are readed after reading AVI header so we already know fpsGravatar atlka2002-01-09
| | | | | | | | 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
* corrections to adjust_subs_time function which now uses fps if neededGravatar atlka2002-01-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4053 b3059339-0415-0410-9bf9-f77b7e298cf2
* added adjust_subs_time function which corrects bad sub->end timeGravatar atlka2002-01-08
| | | | | | | after reading subs so it is sub format independent git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4052 b3059339-0415-0410-9bf9-f77b7e298cf2
* changed subreader.c to read microdvd lines in form "{%ld}{}[^\r\n]" tooGravatar atlka2002-01-08
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4049 b3059339-0415-0410-9bf9-f77b7e298cf2
* tail_space infinite loop fix by jeon_goon@lycos.co.krGravatar arpi2002-01-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3925 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix a warning (ambiguous 'if else')Gravatar pl2001-12-25
| | | | | | | | fix a would be bug (separator) small warning fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3736 b3059339-0415-0410-9bf9-f77b7e298cf2
* vplayer format - no longer crashes on slightly broken subs.Gravatar eyck2001-12-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3725 b3059339-0415-0410-9bf9-f77b7e298cf2
* bzero() -> memset()Gravatar pl2001-12-24
| | | | | | | | malloc()+strcpy() -> strdup() trail_space() slightly changed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3702 b3059339-0415-0410-9bf9-f77b7e298cf2