aboutsummaryrefslogtreecommitdiffhomepage
path: root/subreader.h
Commit message (Collapse)AuthorAge
* mpcommon.h: reduce header dependencies on other headersGravatar Uoti Urpala2010-11-02
| | | | | 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 r30475Gravatar Uoti Urpala2010-03-09
|\
| * Add license header to all top-level files missing them.Gravatar diego2010-01-30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30216Gravatar Uoti Urpala2010-01-08
|\|
| * Add missing config.h #include.Gravatar diego2010-01-04
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30210 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Gravatar Uoti Urpala2009-10-06
|\| | | | | | | | | | | | | | | | | 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.
* | Remove trailing whitespace from most filesGravatar Uoti Urpala2009-07-07
| |
| * whitespace cosmetics: Remove all trailing whitespace.Gravatar diego2009-05-13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Gravatar Uoti Urpala2008-08-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.Gravatar diego2008-08-07
| | | | | | | | | | | | | | 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 namesGravatar Uoti Urpala2008-04-25
|/ | | | | 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.Gravatar diego2008-02-20
| | | | 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.Gravatar diego2007-12-31
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25563 b3059339-0415-0410-9bf9-f77b7e298cf2
* The function parameter 'preferred_language' should be const char *.Gravatar ulion2007-12-17
| | | | 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 ↵Gravatar iive2007-10-28
| | | | | | | | | | 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.Gravatar diego2007-07-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixes:Gravatar rathann2007-03-25
| | | | | | | | | 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 subtitlesGravatar reimar2007-01-06
| | | | | | | 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 ↵Gravatar reynaldo2006-07-09
| | | | | | 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:Gravatar eugeni2006-07-07
| | | | | | | | | - 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.Gravatar albeu2006-03-16
| | | | 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) ↵Gravatar mosu2006-01-04
| | | | | | 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 sideGravatar faust32004-10-18
| | | | | | | | 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. ItGravatar faust32004-09-15
| | | | | | | | | | | 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)Gravatar henry2004-08-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12931 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l, FILE is defined in stdio.hGravatar reimar2004-07-28
| | | | 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.Gravatar reimar2004-07-28
| | | | | | | 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/)Gravatar henry2004-05-08
| | | | 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)Gravatar alex2004-04-06
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12139 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the PJS (aka dunnowhat) subtitlesGravatar attila2004-01-29
| | | | | | | 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 FalcoGravatar henry2003-09-21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10917 b3059339-0415-0410-9bf9-f77b7e298cf2
* option for sub match fuzziness levelGravatar henry2003-04-09
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9894 b3059339-0415-0410-9bf9-f77b7e298cf2
* turn most of the subtitle matching fuzziness off by defaultGravatar henry2003-04-08
| | | | 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>Gravatar henry2003-04-07
| | | | 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 subtitlesGravatar arpi2003-01-27
| | | | | | | | 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>Gravatar arpi2003-01-03
| | | | 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 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
* compiler warning fixesGravatar arpi2002-12-14
| | | | | | | 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 whileGravatar arpi2002-12-05
| | | | | | | | | | | | | | | 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)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
* 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
* New option for mplayer: -dumpmicrodvdsubGravatar kmkaplan2002-09-21
| | | | 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>Gravatar alex2002-09-01
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7216 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
* added dump subtitles to .srtGravatar iive2002-05-27
| | | | 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 ↵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
* 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
* missing exported functionGravatar pl2001-12-25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3735 b3059339-0415-0410-9bf9-f77b7e298cf2
* some small sub bug fixGravatar pontscho2001-12-17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3544 b3059339-0415-0410-9bf9-f77b7e298cf2