summaryrefslogtreecommitdiffstats
path: root/subreader.c
Commit message (Collapse)AuthorAgeFilesLines
* rt subtitle fixesarpi2003-02-071-1/+10
| | | | | | | patch by Andriy N. Gritsenko <andrej@lucky.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9323 b3059339-0415-0410-9bf9-f77b7e298cf2
* compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>arpi2003-02-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9218 b3059339-0415-0410-9bf9-f77b7e298cf2
* sub_utf8 handling hopefully fixedhenry2003-01-281-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9146 b3059339-0415-0410-9bf9-f77b7e298cf2
* maybe fix ogm vs. iconvarpi2003-01-281-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9144 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a command line option (-sub-no-text-pp) to disable subtitlesarpi2003-01-271-1/+3
| | | | | | | | postprocessing, ie. { } removal etc. patch by Salvador Eduardo Tropea <salvador@inti.gov.ar> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9127 b3059339-0415-0410-9bf9-f77b7e298cf2
* - add subcppontscho2003-01-211-3/+15
| | | | | | | | - fix some 10l in gui - fix one 10l bug in subreader git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9057 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1) Removed the code to remove {} from sub_read_line_ssaarpi2003-01-191-33/+49
| | | | | | | | | | | | | 2) Put this code in a separated function: sub_pp_ssa 3) After recoding added a call to sub_pp_ssa. To be more acqurate: I added a pointer to function to hold a postprocessing function to be invoked after using iconv. There are one pointer for each format, if this pointer isn.t NULL the post processing function is called. patch by Salvador Eduardo Tropea <salvador@inti.gov.ar> help by <hephooey@fastmail.fm> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9010 b3059339-0415-0410-9bf9-f77b7e298cf2
* bunkus: fixed a small bug with skipping "{...}" in ssa subsmosu2003-01-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8941 b3059339-0415-0410-9bf9-f77b7e298cf2
* Overlapping subs are a feature mainly present in subtitlingarpi2003-01-101-77/+182
| | | | | | | | | | | | | 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 fromarpi2003-01-091-6/+6
| | | | | | | | | | | | '.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 ,arpi2003-01-051-2/+2
| | | | | | | reported by Nagy Gábor <ngabor79@index.hu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8790 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10larpi2003-01-041-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8786 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10larpi2003-01-031-2/+2
| | | | | | | 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:arpi2002-12-291-2/+2
| | | | | | | | 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 arearpi2002-12-281-0/+23
| | | | | | | | 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 usingarpi2002-12-281-1/+16
| | | | | | | | | | | | | | | | .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 formatarpi2002-12-051-0/+53
| | | | | | | 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 featurearpi2002-12-051-4/+83
| | | | | | | 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)arpi2002-12-051-2/+7
| | | | | | | 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 formatarpi2002-12-041-0/+49
| | | | | | | 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 Iarpi2002-11-161-155/+151
| | | | | | | | | 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 subsarpi2002-11-161-0/+12
| | | | | | | 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 removalarpi2002-11-061-1/+1
| | | | | | | 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 isarpi2002-10-301-5/+103
| | | | | | | | | | | | 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:arpi2002-10-301-5/+200
| | | | | | | | 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 memleaksarpi2002-10-171-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7776 b3059339-0415-0410-9bf9-f77b7e298cf2
* Enable -subfps for time based subtitles, too.atmos42002-10-061-1/+17
| | | | | | | | | | | 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.atmos42002-10-061-2/+21
| | | | 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 bugarpi2002-09-221-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
* New option for mplayer: -dumpmicrodvdsubkmkaplan2002-09-211-0/+34
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7461 b3059339-0415-0410-9bf9-f77b7e298cf2
* FreeBSD iconv change/fixnexus2002-08-281-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7129 b3059339-0415-0410-9bf9-f77b7e298cf2
* Correct dump_srt millisecond outputkmkaplan2002-07-251-3/+11
| | | | | | | 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 ↵arpi2002-07-061-2/+3
| | | | | | <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>alex2002-06-291-4/+26
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6598 b3059339-0415-0410-9bf9-f77b7e298cf2
* msg/i18n fixes and some printf->mp_msgarpi2002-06-031-19/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6297 b3059339-0415-0410-9bf9-f77b7e298cf2
* sub_read_line_ssa sig11 fix by Jindrich Makovicka ↵arpi2002-05-311-2/+2
| | | | | | | | | | | | <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)arpi2002-05-301-2/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6243 b3059339-0415-0410-9bf9-f77b7e298cf2
* added dump subtitles to .srtiive2002-05-271-0/+40
| | | | 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>alex2002-05-231-1/+1
| | | | 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 ↵arpi2002-05-131-5/+62
| | | | | | 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>:pl2002-05-071-2/+38
| | | | | | | - 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>arpi2002-05-051-1/+1
| | | | 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>arpi2002-04-251-2/+2
| | | | 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>arpi2002-03-271-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5364 b3059339-0415-0410-9bf9-f77b7e298cf2
* -subfps and -subdelay alters -dumpmpsub's outputlaaz2002-02-281-4/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4887 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixed a bug with -dumpmpsublaaz2002-02-281-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4881 b3059339-0415-0410-9bf9-f77b7e298cf2
* too many arguments to sscan in subdetect.eyck2002-02-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4520 b3059339-0415-0410-9bf9-f77b7e298cf2
* detect microdvd with empty second frame.eyck2002-01-311-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4445 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixed mpsub bug requested by Gabucinolaaz2002-01-121-2/+5
| | | | 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 fpsatlka2002-01-091-37/+29
| | | | | | | | 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 neededatlka2002-01-081-11/+7
| | | | 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 timeatlka2002-01-081-10/+23
| | | | | | | 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]" tooatlka2002-01-081-2/+17
| | | | 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.krarpi2002-01-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3925 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix a warning (ambiguous 'if else')pl2001-12-251-5/+10
| | | | | | | | 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.eyck2001-12-251-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3725 b3059339-0415-0410-9bf9-f77b7e298cf2
* bzero() -> memset()pl2001-12-241-14/+15
| | | | | | | | malloc()+strcpy() -> strdup() trail_space() slightly changed git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3702 b3059339-0415-0410-9bf9-f77b7e298cf2
* some small sub bug fixpontscho2001-12-171-1/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3544 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by artur Zaprzala:atmos42001-12-101-2/+8
| | | | | | | 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
* patch fixes the showing last line of subtitles and support of SAMI Slacktime ↵arpi2001-11-301-5/+19
| | | | | | option by Evgeny Chukreev <codedj@echo.ru> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3236 b3059339-0415-0410-9bf9-f77b7e298cf2
* fopen(NULL,r) segfault on qnxiive2001-11-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2916 b3059339-0415-0410-9bf9-f77b7e298cf2
* minor cleanups:pl2001-11-151-60/+55
| | | | | | | | | 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
* 11110001.txt find_sub sig11 fixedarpi2001-11-131-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2881 b3059339-0415-0410-9bf9-f77b7e298cf2
* Applied SAMI patch by Evgeny Chukreev <codedj at echo dot ru>atmos42001-11-111-5/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2837 b3059339-0415-0410-9bf9-f77b7e298cf2
* mpsub, FORMAT=<frame> alpha versionlaaz2001-10-261-21/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2496 b3059339-0415-0410-9bf9-f77b7e298cf2
* remowing warning messageatlka2001-10-251-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2469 b3059339-0415-0410-9bf9-f77b7e298cf2
* added DUMPSUBS recognition if we need compile only subreader.c aloneatlka2001-10-241-3/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2450 b3059339-0415-0410-9bf9-f77b7e298cf2
* better FreeBSD iconv implementationnexus2001-10-221-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2359 b3059339-0415-0410-9bf9-f77b7e298cf2
* AQT type support patch by Jiri.Svoboda@seznam.czarpi2001-10-211-2/+51
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2344 b3059339-0415-0410-9bf9-f77b7e298cf2
* MPsub read/write support 0.5 (-dumpmpsub switch)laaz2001-10-121-7/+51
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2179 b3059339-0415-0410-9bf9-f77b7e298cf2
* mpsub read supportlaaz2001-10-121-2/+46
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2178 b3059339-0415-0410-9bf9-f77b7e298cf2
* modifications to use iconv(3) function to recode text of subs (autodetect)atlka2001-10-101-1/+86
| | | | | | | added option -subcp <cpname> # for example cp1250, latin2 etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2152 b3059339-0415-0410-9bf9-f77b7e298cf2
* SSA 2. felvonas (egyre jobban programozok!!!)laaz2001-10-09</