RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-01 04:12:25 +00:00
Code Issues Releases Wiki Activity
30,882 Commits 41 Branches 86 Tags 149 MiB
82b8a649ae
Commit Graph

206 Commits

Author SHA1 Message Date
reimar
b20e08ed94 Extend stream_read_line to support reading lines from UTF-16 encoded files 
and use this to support reading UTF-16 encoded subtitle files in subreader.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30799 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-28 15:24:30 +00:00
reimar
e9a5e7f667 sub_utf8 is handled as a value, not flags everywhere else, so change 
sub_utf8 & 2 to == 2.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30798 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-28 14:27:44 +00:00
reimar
9538251171 Make array describing the subtitle reader modules const. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30797 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-28 14:22:44 +00:00
diego
b63759b175 Do not cast the results of malloc/calloc/realloc. 
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-26 15:01:37 +00:00
komh
316e05b877 Replace platform preprocessor check by HAVE_DOS_PATHS. 
This is both more elegant and more portable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30650 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-02-19 09:14:01 +00:00
diego
99c1bbca2a Add license header to all top-level files missing them. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-30 23:24:23 +00:00
reimar
3526daed7a Fix sub_free to actually free the subtitle data. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30390 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-22 22:10:28 +00:00
reimar
7b953c1763 Fix a memory leak in the subreader. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30389 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-22 21:49:05 +00:00
reimar
1e4f16a344 Replace strncat by av_strlcat which is easier to verify for correctness. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30388 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-22 21:16:54 +00:00
zuxy
534f6aa6b5 Use !isspace() to replace isalnum() to avoid filename mismatch under MBCS 
locale like those in East Asia where most glyphs are neither alphabetical nor
numerical.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30258 b3059339-0415-0410-9bf9-f77b7e298cf2
 2010-01-10 13:52:44 +00:00
reimar
af2988cbce Finally rename the STREAM_SEEK define to MP_STREAM_SEEK, there are just too many 
name clashes, in particular with Windows headers (which define STREAM_SEEK as an enum type).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29962 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-22 15:18:21 +00:00
reimar
4d55629cd6 Fix crash with partial fribidi conversion. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29952 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-22 00:22:24 +00:00
reimar
03e99c5cb8 Make fribidi (i.e. right-to-left) support work with embedded subtitles. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29950 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-22 00:09:40 +00:00
reimar
dc6a72386c sub_fribidi should be static, it is not used outside subreader.c 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29937 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-20 10:32:45 +00:00
reimar
752839d86b Use early return instead of block over whole function. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29936 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-20 10:24:31 +00:00
reimar
6712791ad6 Use FFMAX instead of a custom max macro. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29935 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-11-20 10:22:57 +00:00
diego
6e9cbdc104 whitespace cosmetics: Remove all trailing whitespace. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-13 02:58:57 +00:00
reynaldo
6d781a3226 Get rid of some more trailing whitespace 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29293 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-12 02:41:04 +00:00
diego
a19db0165d Reduce subtitle parsing verbosity. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29172 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-12 20:44:20 +00:00
diego
4d644f513c Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__. 
This avoids a pointless indirection that only obscures what is really done.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27761 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-13 16:23:55 +00:00
diego
091d352d06 Rename font-related preprocessor directives. 
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 10:36:07 +00:00
diego
d17f9943af Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate; 
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27391 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-01 20:28:58 +00:00
diego
4b141479da Start unifying names of internal preprocessor directives. 
Replace all USE_ prefixes by CONFIG_ prefixes to indicate
options which are configurable.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-07-30 12:01:30 +00:00
eugeni
f5a8ce6408 Clear iconv conversion state after each subtitle line. 
This fixes a bug when the last character on a subtitle line
is sometimes moved to the beginning of the next line.

Patch by Guy Shapiro, bugs sguy org.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26921 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-29 18:35:17 +00:00
diego
5423c418c2 cosmetics: Remove useless parentheses from return statements. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26791 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-05-16 09:42:28 +00:00
uau
43ff8aa004 subreader.c: remove unused code 
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
 2008-04-12 15:51:02 +00:00
diego
8a7e7eb34c Move sub_utf8_prev declaration out of the DUMPSUBS #ifdef. 
This helps compilation if DUMPSUBS is defined.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26263 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-03-18 12:49:54 +00:00
diego
1cd1c92fb7 On Win32 and OS/2, 'x:filename' path style without '\' path separator 
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
 2008-02-24 12:40:30 +00:00
diego
e27d606714 Fix illegal identifiers: Names starting with __ or _ and uppercase are reserved 
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
 2008-01-06 23:20:15 +00:00
reimar
2b9c02cca0 Typo fix in message 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25498 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-22 16:05:37 +00:00
ulion
9bfbfd8c4d The function parameter 'preferred_language' should be const char *. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25428 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-12-17 01:06:17 +00:00
iive
b69670151c Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success. 
Requested by ulion.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24880 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-10-28 15:53:08 +00:00
iive
b43c16f8b6 Our enca code uses strdup() on the input encoding name, as we don't modify 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
 2007-10-28 14:26:05 +00:00
reimar
f2b9c324ff Revert r24103, it was nonsense and add a comment that explains the code 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24591 b3059339-0415-0410-9bf9-f77b7e298cf2
 2007-09-22 13:24:58 +00:00
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