1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-15 19:35:49 +00:00
Commit Graph

172 Commits

Author SHA1 Message Date
reimar
84a215de32 -subfps makes sense for frame-based subtitle formats as well!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24103 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-20 09:26:29 +00:00
eugeni
2f1b117313 Revert r23443, it breaks compilation without libass.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23449 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-02 13:00:38 +00:00
eugeni
ed622ce214 Recode the whole subtitle file to utf-8 before parsing.
This allows reading subtitles in ucs-2.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23443 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-01 19:58:29 +00:00
faust3
b03678d00a 10l: comparison of char* ptrs with string literals
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22274 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-19 10:48:50 +00:00
uau
ca7997a50c Fix code updating subtitle array which only moved the text, not endpts.
Led to multiple subtitles on screen disappearing too early without -ass.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22159 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 23:25:50 +00:00
eugeni
dd276fa5ef In .srt, any line containing only spaces and tabs marks the end of the
current subtitle.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21957 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-18 14:50:32 +00:00
reimar
44ecf39567 Document sub_add_text and sub_clear_text
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21851 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-07 12:06:48 +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
reimar
325912bf97 redone subcp_recode: get rid of static buffer, skip lines that failed to
convert instead of removing all remaining lines and remove subcp_recode1
since subcp_recode should now work just as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20298 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-18 16:09:59 +00:00
gpoirier
5fc0b3c9d2 Fix missleading msg printed when subcp_open is given NULL as parameter (like as demux_ogg and demux_mkv do)
Patch by: Zuxy Meng %zuxy.meng A gmail P com%
Original Thread:
Message-ID: <a18e06b40609160400l74263121p5f41eaf3549caf5@mail.gmail.com>
Date: Sat, 16 Sep 2006 19:00:57 +0800
To: mplayer-dev-eng@mplayerhq.hu
Subject: [MPlayer-dev-eng] [PATCH] Remove erroneaus warning message in subreader.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19883 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-18 11:47:41 +00:00
ben
49867bd432 introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-31 17:39:17 +00:00
reynaldo
641a36aa80 corrects some casts that previously discarded the const qualifier. Patch by Stefan Huehner, stefan AT Huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19203 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-27 18:15:35 +00:00
reynaldo
c0c641f0e3 marks several function without a prototype which arent used outside its sourcefile as static, Patch by Stefan Huehner - stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19071 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 20:59:18 +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
reynaldo
f86db2816c this unrelated and erroneus change was applied on my previous commit, reverted
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18875 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-01 04:55:54 +00:00
reynaldo
5b4ec50d44 rm unnecesary void* casts - part 1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18874 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-01 03:56:13 +00:00
reynaldo
4f593b3393 more sizeof(char) fun
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18861 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-30 04:09:29 +00:00
gpoirier
30e68e8da7 Fix problem when subtitle file name is shorter than ".utf-8"
Patch by Evgeniy Stepanov < eugeni P stepanov A gmail P com >
Original thread:
Date: May 23, 2006 10:57 PM
Subject: [MPlayer-dev-eng] [BUG][PATCH] uninitialized memory access in subreader.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18707 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 11:19:39 +00:00
gpoirier
83a9e75c4e fix uninitialized pointer value being passed to open_stream, where it is used in comparison.
Patch by Eugeniy Stepanov < eugeni P stepanov A gmail P com >
Original Thread:
Date: May 23, 2006 10:57 PM
Subject: [MPlayer-dev-eng] [BUG][PATCH] uninitialized memory access in subreader.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18706 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 11:17:21 +00:00
uau
8867515f9b Use 0 and 1 instead of FRIBIDI_FALSE and FRIBIDI_TRUE which are no
longer defined in the current development version of FriBidi. This
reportedly allows compiling MPlayer with the development version which
is needed for Arabic support (some used functions are marked as
deprecated though). Should be safe with older FriBidi versions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18551 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-18 18:31:14 +00:00
rathann
b7c5a2b98d Fix:
subreader.c:1333: warning: assignment discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18515 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-14 22:06:59 +00:00
reynaldo
01ac53f6f0 Part 4 of otvos attila's oattila AT chello-hu mp_msg changes, no modifications this time
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18213 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-23 04:33:09 +00:00
reynaldo
7882100299 Acording to manpage -dumpmicrodvdsub dumps to dumpsub.sub not dumpsub.txt
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18046 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-06 03:27:20 +00:00
iive
c0e553be1e if stream is not seekable calling enca would prevent the real parsing of subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17886 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-17 23:38:46 +00:00
henry
5feccfd289 10l forgotten stream_reset to clear the EOF flag
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17885 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-17 19:39:30 +00:00
albeu
b27336b6d2 And 10L for me. Fix the forgoten enca_fd.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17882 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-16 19:16:07 +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
reimar
46630a96a9 strdup subtitle filename at a more appropriate place, fixing memleaks and
double frees.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15604 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-01 09:01:41 +00:00
henry
a9c37819b2 more paranoid return value checking
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15563 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-24 08:42:20 +00:00
henry
ce70204266 strdup() of a NULL pointer, truckload of cola for me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15383 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-09 18:28:41 +00:00
faust3
b08e2e7c08 bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14643 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-04 18:31:04 +00:00
faust3
0177d487b8 document global variables used with fribidi
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13681 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-18 20:56:11 +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
faust3
574eb892ea subtitle autodetection regardles of case (bug #65), patches Michal Svec <rebel at atrey.karlin.mff.cuni.cz> and Reynaldo H. Verdejo Pinochet <reynaldo at opendot.cl>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13230 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-02 12:18:36 +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
diego
42b784ac1a string handling security fixes
patch by Nicholas Kain, Alexander Strasser <eclipse7@gmx.net>
reviewed by Pontscho, Alex, Rich


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12647 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-25 16:49:53 +00:00
henry
c7fa4d768d 1e6l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12494 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-21 16:02:09 +00:00
rfelker
09f53ea4ad more cola for jindrich
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12456 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-09 22:15:54 +00:00
rfelker
9408d24736 1000000l for sig11 without -subcp!!! (and 1l for my first commit :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12450 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-09 03:43:42 +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
alex
a40bfaec25 skip {...} parts in SAME subs, patch by Salvatore Falco
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12137 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-06 11:22:06 +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
attila
ab424093b4 prevent subreader from segfaulting when sami subs dont have
a <P> at the beginning.
patch by Fabien Tassin <fta+mplayer@sofaraway.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11839 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-24 12:54:05 +00:00
luran
b9a57044fb 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11497 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-19 01:41:27 +00:00
faust3
aad5b2475b sub autoloading fix for windows
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11063 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-09 18:47:16 +00:00
atlka
eb0cf6556f subtitles priority calculation correction
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10933 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-23 05:36:47 +00:00
atlka
74b135fd61 corrected utf8 files autoselection
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10930 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-22 13:44:36 +00:00