RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-29 10:32:15 +00:00
Code Issues Releases Wiki Activity
29,743 Commits 41 Branches 0 Tags 146 MiB
fc1b468117
Commit Graph

1286 Commits

Author SHA1 Message Date
reimar
6fa7e2d867 Make -nosub work to disable subtitles even if -slang and dvd streams are used. 
This still needs some additional checking that subtitle selection via dvdnav works.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29732 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-29 06:44:10 +00:00
reimar
e3625bd232 Add a -nosub option that allows disabling auto-selected subtitles as e.g. the 
mkv demuxer supports.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29730 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-28 11:32:27 +00:00
reimar
f43cc7c3cc Enable loading of external subtitles also for audio-only files. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29728 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-28 11:26:19 +00:00
reimar
95d60aa019 Use a_pos to update subtitle for audio-only files instead of mpctx->sh_audio->pts 
which e.g. for mp3 in AVI never has a useful value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29727 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-28 11:24:13 +00:00
reimar
4b182ff652 Add support for displaying subtitles on the command-line when playing 
audio-only files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29712 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-23 21:48:48 +00:00
reimar
bf16f6f4f3 Make update_subtitles work without sh_video for text subtitles. 
This fixes a crash with e.g. auto-enabled subtitles and -novideo due to
command.c calling update_subtitles even without video and is a step
toward subtitle support for audio-only files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29710 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-23 21:21:58 +00:00
reimar
4dae2a980c Merge two Windows-specific #if sections to simplify the condition. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29684 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-16 18:09:48 +00:00
reimar
1782e34b55 Hack: set DEP/NX on Windows via SetProcessDEPPolicy. 
This should really be done via the NXCOMPAT PE flag, but looks like
binutils will not get support for it any time soon and not having this
security feature enabled is just ridiculous.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29683 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-16 18:07:19 +00:00
reimar
9600686eb5 10l, fix misplaced check in r29613, for loop detection we must compare 
current file name against full name to be added, not current file name
against new base path.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29637 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-02 19:55:24 +00:00
reimar
76cb85c056 Limit amount of data allocated on stack, strlen(filename) is not a good idea for 
file name strings that might come from arbitrary playlists, use PATH_MAX instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29636 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-02 19:49:10 +00:00
reimar
7e8ff35fd2 Add support for directory-specific mplayer.conf configuration file. 
Patch by Christian P. Schmidt "schmidt digadd de"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29634 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-02 19:43:05 +00:00
reimar
d1ff4b7f90 Make the loop detection for mov reference files less aggressive, fixes 
playback of http://stream.qtv.apple.com/qtv/wgbh/http/nova_eu/nova_eu_3012c01_mp4_ref.mov


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29613 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-09-01 15:52:13 +00:00
reimar
efdf0e5fc7 Fix per-file config file loading for DOS paths (i.e. where \ and : can 
also separate path and file name).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29604 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-31 10:07:44 +00:00
reimar
a0eda318e8 Factor out code to try and load a config file only if it exists. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29603 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-31 09:48:25 +00:00
diego
3fde5bd68b Only #include stream/dvbin.h when DVB is enabled. 
dvbin.h #includes some system DVB headers that may be unavailable.
Fixes compilation with DVB disabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29474 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-08-03 16:31:55 +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
reimar
960285ea46 Make ID_SEEKABLE depend on both the stream and the demuxer being seekable, 
instead of only depending on the stream.
This makes the value correctly 0 e.g. for AVI files without index.
Patch by Jason Tackaberry [tack urandom ca]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29331 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-31 12:48:53 +00:00
reimar
b60e7f8ba5 100l, demuxer info tags are _not_ case sensitive, so use strcasecmp. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29329 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-05-30 13:15:53 +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
diego
d0f79295a9 sane verbosity levels for menu initialization 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29231 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-25 12:34:24 +00:00
ramiro
ca242e5f73 Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29154 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-04-08 20:21:21 +00:00
reimar
74e6fb2c01 Set the forced_subs_only value correctly whenever a new spudec is created. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29108 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-30 17:05:39 +00:00
reimar
062f66bbca Make pausing_keep_force the default for the set_mouse_pos and key_down_event - 
different behaviour is unlikely to make sense but it is better to handle
this in input.c instead of adding special cases to mplayer.c and being
able to override the default behaviour at least should not hurt.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28870 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-03-07 13:25:55 +00:00
diego
8d8646d573 Print the version string after the command line has been parsed. 
This allows printing the CPU information when verbose mode is
triggered on the command line.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28691 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-21 17:35:48 +00:00
diego
cdfafa6999 Add priority support for OS/2 and factorize the Windows priority support. 
patch by KO Myung-Hun, komh chollian net


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28520 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-10 15:34:44 +00:00
reimar
a93f56abeb Use SetErrorMode so Windows will not show all kinds of error dialogs 
we do not want.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28497 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-09 15:43:51 +00:00
diego
043159f3bb Do not print a warning if current pts is equal to previous pts. 
patch by Dennis Vshivkov, jaimor orcon net nz


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28445 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 16:02:19 +00:00
compn
43744a2d0f increase max OSD message size limit 
patch by Scaevolus on irc


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28413 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-02-01 00:00:21 +00:00
diego
2067a1f750 Factorize print_version(). 
Print CPU information in verbose mode instead of by default.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28360 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-25 20:35:58 +00:00
reimar
9dee994c23 100l, mixed up ao_data.samplerate and ao_data.bps when calculating sleep time. 
Fixes stuttering audio when playing audio-only files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28329 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-16 09:41:26 +00:00
reimar
452cda5332 More #ifdef -> #if 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28324 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-16 08:45:35 +00:00
diego
61f18f2381 Add missing const qualifier to mpctx_get_audio_out function declaration. 
This fixes the warning:
mplayer.c:381: warning: return discards qualifiers from pointer target type


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28294 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-10 20:01:47 +00:00
reimar
c9ba917877 Avoid a uselessly high number of wakeups when playing audio-only files. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28220 b3059339-0415-0410-9bf9-f77b7e298cf2
 2009-01-01 10:24:19 +00:00
diego
0864f92e7a Get rid of pointless 'extern' keywords. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-03 23:01:03 +00:00
reimar
f6b9f42516 Print ID_EXIT and exit reason message in identify mode when exiting. 
Patch by rvm [rvm3000 ya com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28066 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-12-02 19:53:41 +00:00
reimar
c8993e3c66 Reimplement -endchapter support again for -dump*, it was broken in r25987. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27987 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-11-23 12:45:07 +00:00
diego
74dd64e71d Add an option that sets initial playback volume. 
patch by Reimar and rvm, rvm3000 ya com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27872 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-31 18:44:45 +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
aurel
65db2ef944 Avoid calling init_vo_spudec() too early. 
(before mpctx->d_sub->sh initialization)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27839 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-10-27 22:34:33 +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
nicodvb
20e4a74eb5 slave command to get the number of chapters; patch by Kevin DeKorte - kdekorte gmail com 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27667 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-26 21:17:01 +00:00
reimar
e628297bbd Since the pause loop now also runs commands, set mpctx->was_paused 
before entering it for more consistency.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27666 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-25 17:42:56 +00:00
reimar
97cf6acdab Add an experimental pausing_keep_force slave mode command prefix 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27665 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-09-25 17:40:33 +00:00
diego
ff2a3dd060 Use translatable string instead of hardcoded message for process priority. 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27445 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-09 15:45:00 +00:00
diego
e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and 
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 12:20:50 +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
141e81cce4 Rename a bunch of miscellaneous preprocessor directives. 
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-07 08:58:07 +00:00
diego
82f319af62 Change a bunch of X11-specific preprocessor directives. 
Switch from a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-04 06:16:23 +00:00
diego
02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from 
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
 2008-08-03 15:21:40 +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