summaryrefslogtreecommitdiffstats
path: root/subreader.c
Commit message (Collapse)AuthorAgeFilesLines
* subreader.c: remove unused codeuau2008-04-121-25/+0
| | | | | | | Remove code under "#ifdef DUMPSUBS". This code hasn't worked in years. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26409 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move sub_utf8_prev declaration out of the DUMPSUBS #ifdef.diego2008-03-181-1/+1
| | | | | | | This helps compilation if DUMPSUBS is defined. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26263 b3059339-0415-0410-9bf9-f77b7e298cf2
* On Win32 and OS/2, 'x:filename' path style without '\' path separatordiego2008-02-241-1/+2
| | | | | | | | | is possible as well as 'x:\dir\filename' style. So we should check ':' unless '\' is found. patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26087 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix illegal identifiers: Names starting with __ or _ and uppercase are reserveddiego2008-01-061-1/+1
| | | | | | | for the system, names starting with _ are reserved at file level. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25635 b3059339-0415-0410-9bf9-f77b7e298cf2
* Typo fix in messagereimar2007-12-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25498 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
* Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success.iive2007-10-281-7/+6
| | | | | | | Requested by ulion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24880 b3059339-0415-0410-9bf9-f77b7e298cf2
* Our enca code uses strdup() on the input encoding name, as we don't modify ↵iive2007-10-281-12/+7
| | | | | | | | | | 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
* Revert r24103, it was nonsense and add a comment that explains the codereimar2007-09-221-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24591 b3059339-0415-0410-9bf9-f77b7e298cf2
* -subfps makes sense for frame-based subtitle formats as well!reimar2007-08-201-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24103 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert r23443, it breaks compilation without libass.eugeni2007-06-021-16/+30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23449 b3059339-0415-0410-9bf9-f77b7e298cf2
* Recode the whole subtitle file to utf-8 before parsing.eugeni2007-06-011-30/+16
| | | | | | | This allows reading subtitles in ucs-2. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23443 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l: comparison of char* ptrs with string literalsfaust32007-02-191-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22274 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix code updating subtitle array which only moved the text, not endpts.uau2007-02-051-1/+3
| | | | | | | 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
* In .srt, any line containing only spaces and tabs marks the end of theeugeni2007-01-181-2/+5
| | | | | | | current subtitle. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21957 b3059339-0415-0410-9bf9-f77b7e298cf2
* Document sub_add_text and sub_clear_textreimar2007-01-071-0/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21851 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle handling cleanup: factor out code for parsing embedded subtitlesreimar2007-01-061-0/+71
| | | | | | | 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
* redone subcp_recode: get rid of static buffer, skip lines that failed toreimar2006-10-181-45/+11
| | | | | | | | 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
* Fix missleading msg printed when subcp_open is given NULL as parameter (like ↵gpoirier2006-09-181-1/+2
| | | | | | | | | | | | | | 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
* introduce new 'stream' directory for all stream layer related components and ↵ben2006-07-311-1/+1
| | | | | | split them from libmpdemux git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
* corrects some casts that previously discarded the const qualifier. Patch by ↵reynaldo2006-07-271-3/+3
| | | | | | Stefan Huehner, stefan AT Huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19203 b3059339-0415-0410-9bf9-f77b7e298cf2
* marks several function without a prototype which arent used outside its ↵reynaldo2006-07-131-18/+18
| | | | | | 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
* 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-10/+22
| | | | | | | | | - 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
* this unrelated and erroneus change was applied on my previous commit, revertedreynaldo2006-07-011-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18875 b3059339-0415-0410-9bf9-f77b7e298cf2
* rm unnecesary void* casts - part 1reynaldo2006-07-011-28/+25
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18874 b3059339-0415-0410-9bf9-f77b7e298cf2
* more sizeof(char) funreynaldo2006-06-301-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18861 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix problem when subtitle file name is shorter than ".utf-8"gpoirier2006-06-141-1/+1
| | | | | | | | | | 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
* fix uninitialized pointer value being passed to open_stream, where it is ↵gpoirier2006-06-141-0/+1
| | | | | | | | | | | | 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
* Use 0 and 1 instead of FRIBIDI_FALSE and FRIBIDI_TRUE which are nouau2006-05-181-2/+2
| | | | | | | | | | 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
* Fix:rathann2006-05-141-1/+1
| | | | | | | 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
* Part 4 of otvos attila's oattila AT chello-hu mp_msg changes, no ↵reynaldo2006-04-231-6/+6
| | | | | | modifications this time git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18213 b3059339-0415-0410-9bf9-f77b7e298cf2
* Acording to manpage -dumpmicrodvdsub dumps to dumpsub.sub not dumpsub.txtreynaldo2006-04-061-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18046 b3059339-0415-0410-9bf9-f77b7e298cf2
* if stream is not seekable calling enca would prevent the real parsing of ↵iive2006-03-171-1/+2
| | | | | | subtitles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17886 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l forgotten stream_reset to clear the EOF flaghenry2006-03-171-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17885 b3059339-0415-0410-9bf9-f77b7e298cf2
* And 10L for me. Fix the forgoten enca_fd.albeu2006-03-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17882 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move the subread from FILE to stream_t.albeu2006-03-161-49/+50
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17880 b3059339-0415-0410-9bf9-f77b7e298cf2
* strdup subtitle filename at a more appropriate place, fixing memleaks andreimar2005-06-011-2/+1
| | | | | | | double frees. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15604 b3059339-0415-0410-9bf9-f77b7e298cf2
* more paranoid return value checkinghenry2005-05-241-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15563 b3059339-0415-0410-9bf9-f77b7e298cf2
* strdup() of a NULL pointer, truckload of cola for mehenry2005-05-091-3/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15383 b3059339-0415-0410-9bf9-f77b7e298cf2
* bzero is deprecated patch by Gianluigi Tiesi <mplayer at netfarm.it>faust32005-02-041-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14643 b3059339-0415-0410-9bf9-f77b7e298cf2
* document global variables used with fribidifaust32004-10-181-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13681 b3059339-0415-0410-9bf9-f77b7e298cf2
* correctly display the commas of most hebrew subtitles on the left sidefaust32004-10-181-1/+2
| | | | | | | | 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-5/+37
| | | | | | | | | | | 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
* subtitle autodetection regardles of case (bug #65), patches Michal Svec ↵faust32004-09-021-1/+1
| | | | | | <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
* fixes a crash and unchecked string-handling in ENCA code.reimar2004-07-281-38/+21
| | | | | | | Also does a bit of cleanup. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12910 b3059339-0415-0410-9bf9-f77b7e298cf2
* string handling security fixesdiego2004-06-251-1/+1
| | | | | | | | 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
* 1e6lhenry2004-05-211-5/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12494 b3059339-0415-0410-9bf9-f77b7e298cf2
* more cola for jindrichrfelker2004-05-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12456 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1000000l for sig11 without -subcp!!! (and 1l for my first commit :)rfelker2004-05-091-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12450 b3059339-0415-0410-9bf9-f77b7e298cf2
* ENCA support (http://trific.ath.cx/software/enca/)henry2004-05-081-4/+85
| | | | 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-1/+30
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12139 b3059339-0415-0410-9bf9-f77b7e298cf2
* skip {...} parts in SAME subs, patch by Salvatore Falcoalex2004-04-061-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12137 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix the PJS (aka dunnowhat) subtitlesattila2004-01-291-7/+38
| | | | | | | patch by Salvador Eduardo Tropea <salvador@inti.gov.ar> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11874 b3059339-0415-0410-9bf9-f77b7e298cf2
* prevent subreader from segfaulting when sami subs dont haveattila2004-01-241-3/+14
| | | | | | | | 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
* 10lluran2003-11-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11497 b3059339-0415-0410-9bf9-f77b7e298cf2
* sub autoloading fix for windowsfaust32003-10-091-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11063 b3059339-0415-0410-9bf9-f77b7e298cf2
* subtitles priority calculation correctionatlka2003-09-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10933 b3059339-0415-0410-9bf9-f77b7e298cf2
* corrected utf8 files autoselectionatlka2003-09-221-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10930 b3059339-0415-0410-9bf9-f77b7e298cf2
* Subtitle alignment & smart splitting by Salvatore Falcohenry2003-09-211-2/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10917 b3059339-0415-0410-9bf9-f77b7e298cf2
* Jacosub files can have the extension '.js' too. Patch by Vladimir Mosgalin ↵alex2003-09-021-1/+1
| | | | | | <mosgalin@VM10124.spb.edu> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10802 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support for case insensitive string matching in SAMI subtitle files. Patch ↵mosu2003-08-251-4/+18
| | | | | | by Bruno Lecointre. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10693 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fixes FriBiDi support and extends it with configure options. Patch by ↵alex2003-08-171-2/+5
| | | | | | Raindel Shachar <raindel@techunix.technion.ac.il> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10650 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10lalex2003-08-101-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10556 b3059339-0415-0410-9bf9-f77b7e298cf2
* another attempt to fix the subtitle searchinghenry2003-08-091-6/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10552 b3059339-0415-0410-9bf9-f77b7e298cf2
* some more cola - misplaced breakhenry2003-08-081-8/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10545 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1, micro-speedup 2, fixed 10l: only prefer utf8 if iconv is presentalex2003-07-281-2/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10495 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix against dummy solaris sprintf, bug reported by Gotz Waschkalex2003-07-271-4/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10487 b3059339-0415-0410-9bf9-f77b7e298cf2
* ASS supporthenry2003-07-201-2/+10
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10451 b3059339-0415-0410-9bf9-f77b7e298cf2
* always treat .utf* files as UTF-8atlka2003-07-011-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10357 b3059339-0415-0410-9bf9-f77b7e298cf2
* sub_utf8 fiddlingatlka2003-07-011-6/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10355 b3059339-0415-0410-9bf9-f77b7e298cf2
* small correction of sub_utf8 restoring between reading sub filesatlka2003-07-011-11/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10354 b3059339-0415-0410-9bf9-f77b7e298cf2
* prefer UTF-8 encoding subs and automatically recognize them by suffixatlka2003-06-271-3/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10341 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10Lhenry2003-06-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10337 b3059339-0415-0410-9bf9-f77b7e298cf2
* warning fixes by Dominikalex2003-06-011-1/+1
| | |