Commit Graph

44 Commits

Author SHA1 Message Date
diego 3e9e4acd8d Do not use leading underscores in multiple inclusion guards, they are reserved.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23709 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-02 22:34:45 +00:00
rathann 02d3e141fb Fixes:
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
2007-03-25 19:25:11 +00:00
reimar 61e4a80191 Subtitle handling cleanup: factor out code for parsing embedded subtitles
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
2007-01-06 19:07:58 +00:00
reynaldo 4728357b58 Marks several string parameters as const when they are not modified in the function, Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18985 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-09 17:45:36 +00:00
eugeni 2f2d8cef15 Split guess_cp() in two functions:
- 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
2006-07-07 18:07:39 +00:00
albeu badc607fa1 Move the subread from FILE to stream_t.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17880 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-16 14:42:51 +00:00
mosu 2e40bfa136 Improved handling of text subs in Matroska files with adjacent newlines (\N) 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
2006-01-04 12:05:15 +00:00
faust3 229c7f9c84 correctly display the commas of most hebrew subtitles on the left side
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
2004-10-18 20:41:06 +00:00
faust3 5e00ed042b This time is a patch to improve subtitle alignment management. It
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
2004-09-15 13:16:52 +00:00
henry 70836f5da2 missing guess_cp declaration (patch by Ismail Dönmez)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12931 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-02 06:46:48 +00:00
reimar f2822d7ae7 10l, FILE is defined in stdio.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12911 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-28 17:03:09 +00:00
reimar 57b8d5c7f6 fixes a crash and unchecked string-handling in ENCA code.
Also does a bit of cleanup.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12910 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-28 12:40:35 +00:00
henry c1f6ffe35d ENCA support (http://trific.ath.cx/software/enca/)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12444 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-08 17:52:25 +00:00
alex 928e11d1f1 MPL2 subreader, patch by Cezary Jackiewicz (cjackiewicz@poczta.onet.pl)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12139 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-06 11:52:31 +00:00
attila 9c1a921ef3 Fix the PJS (aka dunnowhat) subtitles
patch by Salvador Eduardo Tropea <salvador@inti.gov.ar>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11874 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-29 10:53:19 +00:00
henry 1526dc6cdf Subtitle alignment & smart splitting by Salvatore Falco
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10917 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-21 13:20:06 +00:00
henry a024c7fe90 option for sub match fuzziness level
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9894 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-09 18:04:29 +00:00
henry 819515d6fb turn most of the subtitle matching fuzziness off by default
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9885 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-08 20:41:20 +00:00
henry 3f4505eabb support for multiple subtitle files by Marcin Wojdyr <wojdyr@unipress.waw.pl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9871 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-07 16:04:02 +00:00
arpi 09e742fe2f Add a command line option (-sub-no-text-pp) to disable subtitles
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
2003-01-27 23:41:56 +00:00
arpi c11bd13ed6 compiler warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8734 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-03 12:26:17 +00:00
arpi e29bcd7e02 This patch adds a call to subcp_recode1(), so this subtitles too are
processed through iconv().
Kresimir Kukulj                      madmax@iskon.hr


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8619 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-28 15:19:41 +00:00
arpi b987127e0e compiler warning fixes
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
2002-12-14 17:56:35 +00:00
arpi 05802842c9 This patch makes it possible to navigate among the subtitles while
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
2002-12-05 00:15:56 +00:00
arpi 268b2c1a0f overlapping subtitles support is now optional, can be disabled (-nooverlapsub)
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8362 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:03:35 +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
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
alex 421677d829 increased SUB_MAX_TEXT by Piotr Krukowiecki <piotr@pingu.ii.uj.edu.pl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7216 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-01 11:08:28 +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
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
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
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
pl 362474485e missing exported function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3735 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-12-25 16:39:12 +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
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 0768e4202e -Wall warnings fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2051 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-10-02 21:45:41 +00:00
laaz d7f6f3e341 Added support for .ssa subtitles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@922 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-31 18:08:24 +00:00
arpi_esp 7895a99e80 implemented ~/.mplayer/sub/filename.sub stuff
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@893 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-27 20:59:58 +00:00
eyck 9e372bc823 Support for vplayer subtitles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@819 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-05-17 09:17:16 +00:00
laaz ac519106bd added support for SAMI subtitle support (.smi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@625 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-04-24 21:39:18 +00:00
pontscho 4ff11b9949 clean up
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@617 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-04-24 11:42:04 +00:00
pontscho 7eef93819f add sub autodetect
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@510 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-04-18 20:25:04 +00:00
arpi_esp 9b92dd3a1d subtitles (.sub files) support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@259 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-03-30 03:07:45 +00:00