Commit Graph

116 Commits

Author SHA1 Message Date
henry 6c24426032 some more cola - misplaced break
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10545 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-08 23:26:48 +00:00
alex 05e09adb9f 1, micro-speedup 2, fixed 10l: only prefer utf8 if iconv is present
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10495 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-28 14:17:31 +00:00
alex 93f8320aec fix against dummy solaris sprintf, bug reported by Gotz Waschk
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10487 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-27 22:23:07 +00:00
henry a50a1eab17 ASS support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10451 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-20 15:29:40 +00:00
atlka 5f92ac1d7b always treat .utf* files as UTF-8
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10357 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-01 09:29:31 +00:00
atlka 1639ad0ba3 sub_utf8 fiddling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10355 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-01 08:49:14 +00:00
atlka 6b4a12daa2 small correction of sub_utf8 restoring between reading sub files
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10354 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-01 07:16:39 +00:00
atlka f16fa9d31a prefer UTF-8 encoding subs and automatically recognize them by suffix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10341 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-27 09:25:05 +00:00
henry 69063f84ad 10L
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10337 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-25 20:12:36 +00:00
alex cc1edea30e warning fixes by Dominik
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10237 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-06-01 22:16:41 +00:00
alex 27ce33fe08 unleak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10221 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-05-31 17:33:33 +00:00
henry e8ad4a04a7 cleanups/bugfixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9896 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-09 20:49:12 +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
alex 90061e5e3c 10l fix by Salvatore Falco <salvatore.falco@katamail.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9889 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-09 15:51:37 +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 fef3203aa0 fix compilation without iconv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9873 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-07 19:37:19 +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
alex 981ef7408b hebrew support using fribidi libs, patch by Raindel Shachar <raindel@techunix.technion.ac.il>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9636 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-21 16:54:03 +00:00
arpi 738f3de6c3 rt subtitle fixes
patch by Andriy N. Gritsenko <andrej@lucky.net>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9323 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-07 21:12:50 +00:00
arpi ca0263659f compiler warning fixes patch by Dominik Mierzejewski <dominik@rangers.eu.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9218 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-02-02 02:42:59 +00:00
henry e633df0399 sub_utf8 handling hopefully fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9146 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-28 18:45:58 +00:00
arpi 7e5bca4243 maybe fix ogm vs. iconv
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9144 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-28 18:28:09 +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
pontscho ebdb38271e - add subcp
- 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
2003-01-21 19:12:46 +00:00
arpi 824048ca44 1) Removed the code to remove {} from sub_read_line_ssa
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
2003-01-19 00:54:55 +00:00
mosu 84fac13ad1 bunkus: fixed a small bug with skipping "{...}" in ssa subs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8941 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-13 10:07:38 +00:00
arpi d459e64463 Overlapping subs are a feature mainly present in subtitling
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
2003-01-10 22:53:34 +00:00
arpi 2c443c4c0b Since version 2.7 the file extension for JACOsub changed from
'.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
2003-01-09 19:25:05 +00:00
arpi 732657af3f some subviewer versions uses : instead of . or ,
reported by Nagy Gábor <ngabor79@index.hu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8790 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-05 02:46:13 +00:00
arpi e6e0f6674f 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8786 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-04 21:26:35 +00:00
arpi 1eb429c1d8 10l
patch by Oskar Liljeblad <oskar@osk.mine.nu>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8735 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-03 12:30:47 +00:00
arpi f8c9f53352 support for subviewer format using dots instead of commas:
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
2002-12-29 21:04:45 +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 d3b9403406 Attached is a small patch to fix a couple of problems I found when using
.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
2002-12-28 13:42:24 +00:00
arpi 919f3710b1 dump subtitles in SAMI format
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8364 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:07:59 +00:00
arpi a3243d2265 optional (compile-time switch) subtitles-sorting feature
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8363 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-05 00:05:57 +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 7228f67795 dump in JACOsub format
patch by Salvatore Falco <sfalco@studenti.ing.uniroma1.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8361 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-04 23:58:38 +00:00
arpi 4bda81ad16 I recently sent a patch for a new subtitles format, JACOsub. Since then I
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
2002-11-16 03:25:37 +00:00
arpi 41db8e63dc allow max 0.2s overlapping without splitting subs
patch by salvatore.falco@katamail.com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8207 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-16 03:23:49 +00:00
arpi f859d013a8 *HUGE* set of compiler warning fixes, unused variables removal
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
2002-11-06 23:54:29 +00:00
arpi d200725e88 This patch is to add support for overlapping subtitles, that is
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
2002-10-30 19:26:05 +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
arpi 4293eebe30 small memleaks
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7776 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 00:53:14 +00:00
atmos4 ff72be050b Enable -subfps for time based subtitles, too.
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
2002-10-06 02:59:04 +00:00
atmos4 d803db3e15 Skip html tags (like <i>) inside subviewer subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7609 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-06 00:46:47 +00:00
arpi d483a015a2 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-22 02:33:28 +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
nexus af4654d926 FreeBSD iconv change/fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7129 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-28 23:00:25 +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