0
0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Commit Graph

83 Commits

Author SHA1 Message Date
cboesch
920d0976e7 Change some filename-handling code to use mp_basename()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32675 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-12-16 05:27:13 +02:00
diego
12d3e0df99 cleanup: don't check for NULL before free()
patch by Clément Bœsch, ubitux gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-08 18:05:12 +02:00
reimar
545f64c5cb vobsub.c: Remove useless casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32053 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:16:45 +02:00
reimar
cbe036312a vobsub: Only try to merge packets if we have an earlier one stored
Based on patch by 191919 [191919 gmail com].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31787 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
diego
a1b8092c87 Factorize MPlayer/MEncoder version string handling.
The string now resides in a central object file instead of
being duplicated in every file that requires a version string.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31577 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
iive
3517a9b72b New hack for vobsub packet merging.
It seems that if there is no padding between packets then they actually belong to one subtitle picture.
The new hack seems to work far more reliable than the (already removed) old one.
Patch by Ubitux (gmail)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31104 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-27 22:06:29 +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
diego
3e8f2815c1 cosmetics: tabs to spaces, K&R function declarations, cuddle else clauses
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30136 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-12-29 18:09:07 +00:00
diego
64d5279410 Remove pointless #ifdefs around harmless internal header #includes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29471 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-08-02 16:00:55 +00:00
compn
0c1ce64fe4 cosmetics: replace dead url
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29347 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-06-03 17:27:22 +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
9a420b0f93 Get rid of some more trailing whitespace
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29292 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-05-12 02:33:28 +00:00
aurel
bce49a37d4 vobsub: move extradata out of vobsub_t struct
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27874 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-01 13:56:11 +00:00
aurel
b64af5543c vobsub: add sanity check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27873 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-01 13:51:39 +00:00
aurel
97293969b4 Factorize vobsub idx/extradata handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27841 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-27 22:51:22 +00:00
reimar
c1751adcc1 Fix forumla -> formula in comment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27483 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-26 18:41:04 +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
ulion
015ba173a1 Add detection code for abnormal pts jump when seeking previous.
This patch make the vobsub works more accurately according to the requested pts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26765 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 03:43:45 +00:00
ulion
020fe6ff75 Seek by pts accurately.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26764 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-14 03:37:03 +00:00
ulion
5d2de57e5b Fix vobsub_seek use same reseek method as vobsub_get_packet did.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25819 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-20 15:43:10 +00:00
ulion
969bc9cb89 Fix code to prevent from accessing queue->packets[-1].pts that causes a crash.
Found and patched by Reimar.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25774 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-17 02:18:49 +00:00
ulion
75e3df67ae Fix comment from unrarlib to unrar_exec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25471 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 10:41:16 +00:00
ulion
a4c16de071 Remove redundant code since unrarlib was removed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25470 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 10:40:30 +00:00
diego
f9455f34d0 Remove internal unrarlib copy, the new unrarexec code is a strict superset.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25468 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 10:10:26 +00:00
ulion
4a901e4db0 Vobsub support tridx setting in .idx file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25460 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-19 08:35:40 +00:00
ulion
aaf4c414a6 Use calloc instead of malloc when allocate vobsub_t.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25459 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-19 04:45:45 +00:00
ulion
df0f80508e Support using unrar executable to access rar-compressed vobsub files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25389 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-14 08:16:39 +00:00
ulion
4c6a12e619 Fix spudec to display current vobsub immediately after a seek.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25350 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-11 10:12:58 +00:00
ulion
6e9b19642a Convert vobsub custom colors from rgb to yuv using a common function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25326 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-09 06:58:57 +00:00
ulion
3942e8143b Remove useless include added in last commit by mistake.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25322 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-08 14:19:12 +00:00
ulion
151e8cceec Move vobsub palette->yuv convert code into a common function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25320 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-08 12:15:03 +00:00
ulion
fad92e57fa Restore y of palette into the same value range as it was in the .ifo file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25317 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-08 02:38:02 +00:00
ulion
0f04ca9adf Skip empty vobsub streams when selecting subtitles.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25279 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-03 04:08:36 +00:00
ulion
c9dee90d0b Fix custom palette format from rgb to yuv, we use it as yuv in the spudec.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25277 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-03 03:20:11 +00:00
ulion
09270628da Even when vobsub is forced, .ifo file is still not necessary,
so change the log level from error to warning.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25197 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-29 03:35:50 +00:00
ulion
5363464d0a Check boundary for queue's current_index.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25147 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 13:17:36 +00:00
reimar
8e7945155c Use libavutil's av_clip* instead of unreadable MIN/MAX chaos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22395 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-01 12:54:08 +00:00
reimar
0ba390c7a3 Open vobsub output files in binary mode, otherwise the OS might
do all kinds of evil mangling to them (fixes bug #668).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21460 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-03 11:23:04 +00:00
reimar
e0892295b5 Useless initialization, they will be always set for result != 0
and for result == 0 they make no sense


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20102 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 09:05:27 +00:00
reynaldo
a814f0ebcd removes unused parentheses lefted behind in the r19075 sizeof(char) cleanups, noticed by dalias
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19079 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-14 06:26:31 +00:00
reynaldo
26f0e5e4a1 more sizeof(char) fun
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19075 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 22:11:47 +00:00
reynaldo
3a406e94d7 Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 07:20:34 +00:00
faust3
06f0cd6893 avoid conflicting types error on cygwin
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17528 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-02 12:01:40 +00:00
reimar
f8b41e9052 fix memleak in idx parser. patch by elupus [elupus {at] ecce <dot) se]
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14238 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-25 12:08:33 +00:00
mosu
50a86fcc34 Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-25 22:24:00 +00:00
luran
e3f069bf7a fix the crash when seek with 'unknown' subtitles, hopefully...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11710 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-01-01 11:01:09 +00:00
nexus
9d3d9aa34a fix typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11696 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-28 00:43:21 +00:00
alex
c7f47f1837 10l found by atmos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11595 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 21:53:54 +00:00
alex
0955d23934 vobsub seeking support by Lu Ran
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11590 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 18:35:39 +00:00
mosu
7931d804f1 Improved searching for VobSubs inside RAR archives even if the names do not match the movie name. Do not display VobSubs whose timecodes are < 0 which would make all VobSubs appear from the start on upon seeking. Patches by "Reder, Uwe" <Uwe.Reder@3SOFT.de>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11310 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-10-28 22:36:56 +00:00