summaryrefslogtreecommitdiffstats
path: root/subreader.h
Commit message (Collapse)AuthorAgeFilesLines
* mpcommon.h: reduce header dependencies on other headersUoti Urpala2010-11-021-2/+2
| | | | | Use "struct foo *ptr" without full definition of the struct, instead of using typedef names and including other headers for them.
* Merge svn changes up to r30475Uoti Urpala2010-03-091-0/+18
|\
| * Add license header to all top-level files missing them.diego2010-01-301-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30216Uoti Urpala2010-01-081-0/+2
|\|
| * Add missing config.h #include.diego2010-01-041-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30210 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-1/+2
|\| | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-2/+2
| |
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Rename font-related preprocessor directives.diego2008-08-071-1/+1
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-251-3/+3
|/ | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* Remove pointless #ifdefs around extern declarations.diego2008-02-201-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explanatory comments to the #endif part of multiple inclusion guards.diego2007-12-311-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
* The function parameter 'preferred_language' should be const char *.ulion2007-12-171-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25428 b3059339-0415-0410-9bf9-f77b7e298cf2
* Our enca code uses strdup() on the input encoding name, as we don't modify ↵iive2007-10-281-2/+2
| | | | | | | | | | it we can use the original constant string. Uses less memory, code is simpler and faster. Fixes memory leak (noticed by ulion). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24879 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use leading underscores in multiple inclusion guards, they are reserved.diego2007-07-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixes:rathann2007-03-251-1/+1
| | | | | | | | | demux_ogg.c:253: warning: implicit declaration of function ‘subcp_recode’ Approved by Reimar. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22823 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle handling cleanup: factor out code for parsing embedded subtitlesreimar2007-01-061-0/+3
| | | | | | | and adding and removing of lines in subtitle struct into subreader.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21845 b3059339-0415-0410-9bf9-f77b7e298cf2
* Marks several string parameters as const when they are not modified in the ↵reynaldo2006-07-091-1/+1
| | | | | | function, Patch by Stefan Huehner, stefan AT huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18985 b3059339-0415-0410-9bf9-f77b7e298cf2
* Split guess_cp() in two functions:eugeni2006-07-071-0/+1
| | | | | | | | | - guess_buffer_cp() determines the encoding of text, given a pointer to a buffer and its length; - guess_cp() reads some data from stream and calls guess_buffer_cp() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18941 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move the subread from FILE to stream_t.albeu2006-03-161-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17880 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improved handling of text subs in Matroska files with adjacent newlines (\N) ↵mosu2006-01-041-1/+1
| | | | | | resulting in more than SUB_MAX_TEXT lines to display. Patch by Robert Henney (robh () rut ! org). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17309 b3059339-0415-0410-9bf9-f77b7e298cf2
* correctly display the commas of most hebrew subtitles on the left sidefaust32004-10-181-0/+6
| | | | | | | | of the sentence with fribidi, make the old behaviour optional patch by Shachar Raindel <shacharr <at> gmail.com> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13680 b3059339-0415-0410-9bf9-f77b7e298cf2
* This time is a patch to improve subtitle alignment management. Itfaust32004-09-151-3/+9
| | | | | | | | | | | implements SSA alignment styles; note that alignment for SSA files is not actually supported, but for SAMI files (which use the same alignment codes) it is. patch by Salvatore Falco <sfalco at studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13344 b3059339-0415-0410-9bf9-f77b7e298cf2
* missing guess_cp declaration (patch by Ismail Dönmez)henry2004-08-021-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12931 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, FILE is defined in stdio.hreimar2004-07-281-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12911 b3059339-0415-0410-9bf9-f77b7e298cf2
* fixes a crash and unchecked string-handling in ENCA code.reimar2004-07-281-2/+3
| | | | | | | Also does a bit of cleanup. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12910 b3059339-0415-0410-9bf9-f77b7e298cf2
* ENCA support (http://trific.ath.cx/software/enca/)henry2004-05-081-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12444 b3059339-0415-0410-9bf9-f77b7e298cf2
* MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)alex2004-04-061-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12139 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the PJS (aka dunnowhat) subtitlesattila2004-01-291-1/+1
| | | | | | | patch by Salvador Eduardo Tropea <salvador@inti.gov.ar> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11874 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle alignment & smart splitting by Salvatore Falcohenry2003-09-211-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10917 b3059339-0415-0410-9bf9-f77b7e298cf2
* option for sub match fuzziness levelhenry2003-04-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9894 b3059339-0415-0410-9bf9-f77b7e298cf2
* turn most of the subtitle matching fuzziness off by defaulthenry2003-04-081-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9885 b3059339-0415-0410-9bf9-f77b7e298cf2
* support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>henry2003-04-071-14/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9871 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a command line option (-sub-no-text-pp) to disable subtitlesarpi2003-01-271-0/+1
| | | | | | | | 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
* compiler warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>arpi2003-01-031-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8734 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch adds a call to subcp_recode1(), so this subtitles too arearpi2002-12-281-0/+1
| | | | | | | | processed through iconv(). Kresimir Kukulj madmax@iskon.hr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8619 b3059339-0415-0410-9bf9-f77b7e298cf2
* compiler warning fixesarpi2002-12-141-0/+2
| | | | | | | based on patch by Dominik Mierzejewski <dominik@rangers.eu.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8452 b3059339-0415-0410-9bf9-f77b7e298cf2
* This patch makes it possible to navigate among the subtitles whilearpi2002-12-051-0/+1
| | | | | | | | | | | | | | | playing movies. It can be very useful when using desynched subtitles. A new command 'sub_step' is added, which takes an integer argument. 'sub_step +1' will immediately display the next subtitle, adjusting sub_delay as if one had used the 'sub_delay' command to navigate to the subtitle. 'sub_step -1' displays the previous subtitle and adjusts the sub_delay. By using these two commands you can navigate among the subtitles without having to search blindly using 'sub_delay'. patch by Oskar Liljeblad (oskar@osk.mine.nu) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8366 b3059339-0415-0410-9bf9-f77b7e298cf2
* overlapping subtitles support is now optional, can be disabled (-nooverlapsub)arpi2002-12-051-0/+1
| | | | | | | patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
* JACOSub is another subtitling format, whose specifications are at:arpi2002-10-301-0/+1
| | | | | | | | 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
* New option for mplayer: -dumpmicrodvdsubkmkaplan2002-09-211-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7461 b3059339-0415-0410-9bf9-f77b7e298cf2
* increased SUB_MAX_TEXT by Piotr Krukowiecki <piotr@pingu.ii.uj.edu.pl>alex2002-09-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7216 b3059339-0415-0410-9bf9-f77b7e298cf2
* Correct dump_srt millisecond outputkmkaplan2002-07-251-1/+1
| | | | | | | 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
* added dump subtitles to .srtiive2002-05-271-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6209 b3059339-0415-0410-9bf9-f77b7e298cf2
* patch fixes broken detecniou of AQTitle subtiles and adds support for ↵arpi2002-05-131-0/+1
| | | | | | 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-0/+1
| | | | | | | - subviewer 2.0 support git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6013 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. subs know are readed after reading AVI header so we already know fpsatlka2002-01-091-5/+4
| | | | | | | | 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
* missing exported functionpl2001-12-251-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3735 b3059339-0415-0410-9bf9-f77b7e298cf2
* some small sub bug fixpontscho2001-12-171-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3544 b3059339-0415-0410-9bf9-f77b7e298cf2
* minor cleanups:pl2001-11-151-6/+17
| | | | | | | | | 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
* -Wall warnings fixedarpi2001-10-021-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2051 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added support for .ssa subtitleslaaz2001-05-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@922 b3059339-0415-0410-9bf9-f77b7e298cf2
* implemented ~/.mplayer/sub/filename.sub stuffarpi_esp2001-05-271-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@893 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for vplayer subtitleseyck2001-05-171-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@819 b3059339-0415-0410-9bf9-f77b7e298cf2
* added support for SAMI subtitle support (.smi)laaz2001-04-241-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@625 b3059339-0415-0410-9bf9-f77b7e298cf2
* clean uppontscho2001-04-241-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@617 b3059339-0415-0410-9bf9-f77b7e298cf2
* add sub autodetectpontscho2001-04-181-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@510 b3059339-0415-0410-9bf9-f77b7e298cf2
* subtitles (.sub files) supportarpi_esp2001-03-301-0/+19
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@259 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 19:45:51 +0000