1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Commit Graph

37 Commits

Author SHA1 Message Date
Uoti Urpala
8c144171bb Merge svn changes up to r28087
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
2008-12-04 01:55:52 +02: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
Uoti Urpala
17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03: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
5641e60698 Ahem, the MACOSX_FINDER_SUPPORT directive was renamed to MACOSX_FINDER.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27426 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 10:57:40 +00:00
Uoti Urpala
fb33e286b5 Move global mconfig to mpctx
The global was used in the function cfg_include which handles the
-include option. Make the address available in that function by
creating a new dynamically allocated option in m_config_new that has
the address in the option's private data.

asxparser.c also used the global. Making it available through all ways
the code could get called required a number of relatively straightforward
changes to playtree and menu code.
2008-04-26 10:44:59 +03:00
uau
03bb309e4e Include some .h files in corresponding .c files
Include the corresponding .h file in command.c, parser-cfg.c and
parser-mpcmd.c. This allows the compiler to check that the
declarations in the .h file match the actual defition.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26295 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-03-28 01:07:59 +00:00
reimar
8373b55173 Mark more m_option_t uses as const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25255 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 15:46:44 +00:00
ptt
c846ef4a98 localization of parser-m*cmd.c messages
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21328 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-27 15:46:36 +00:00
albeu
400a9fab2e Doxygen Attack! - Chapter 3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18266 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-25 01:26:10 +00:00
reynaldo
889eedb39e Small fix, incorrect MSGL at fatal error
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18210 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-22 21:30:34 +00:00
reimar
5c332bb395 also print an error when parsing fails with M_OPT_INVALID or M_OPT_PARSER_ERR.
fixes MPlayer exiting without message for e.g. "mplayer -ao"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18149 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-19 15:50:37 +00:00
reimar
86acb156cf avoid crash when running "mplayer -loop" (dereferencing uninitialize pointer).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18098 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-14 21:51:45 +00:00
albeu
7f28974433 Make -list-options work in both MPlayer and MEncoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17473 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-24 11:34:24 +00:00
gpoirier
43844d090c allow multiple help clauses on the command line, Patch by kiriuja " mplayer-patches AH en-directo POUM net "
This one makes

mplayer -vo help -ao help -ac help -vc help -pphelp -af help -vfm help -vf help -afm help -fstype help

produce the desired output.

From the thread:
Date: Jul 16, 2005 8:25 PM
Subject: [MPlayer-dev-eng] [PATCH] allow multiple help clauses on the command line


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16346 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 08:29:30 +00:00
reimar
c6e32e91b1 when somebody specifies e.g. --loop, the message says that a -loop option
does not exist. So add an extra - to the message.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15743 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-17 08:11:56 +00:00
reimar
1390092640 Make "mplayer -- --a" play the file --a instead of bailing out with a useless
error message


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15246 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-23 20:41:19 +00:00
diego
6974dfae6b Clarify confusing error message.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14542 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-19 18:24:53 +00:00
reimar
8fb512dbf0 fix: when doing -loop 0 -shuffle, the arg after shuffle was skipped
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13933 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-14 11:09:56 +00:00
nplourde
2cc1ec3ea4 add support for macosx finder argument support (let you bundle mplayer to be a finder compliant .app) patch by Chris Roccati <roccati@pobox.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13910 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-10 16:43:40 +00:00
diego
de22e52855 -use-stdin renamed to -noconsolecontrols.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12817 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-14 09:27:04 +00:00
rtognimp
1d0ac71ae8 Support dvd://start_title-end_title as requested on wishlist
Patch by adland


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12544 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-06-07 18:58:08 +00:00
rtognimp
a6cf371922 Fail if empty or nonexitant playlist
Patch by adland


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12268 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-24 13:15:31 +00:00
alex
1c4586e8f9 100l to albeu for his english grammar, and 10l to me becouse I noticed that lately (my backward compatibilty macro uses M_OPT_UNKNOWN)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10596 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-13 16:45:02 +00:00
alex
2283b6305f Removed the historic cfgparser and switched full to the new config parser (altought some macros still remain for compatibility). As a side effect 90% of the warning messages are gone from the core. Things should be cleaner now and less confusing for newbies.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10595 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-13 16:29:32 +00:00
pl
8ab25e100d fix the bug where only the last file of the command line is found
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10543 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-08 20:07:38 +00:00
alex
2124a9a36f c vs c++ syntax
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10514 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-03 17:42:43 +00:00
diego
8838b4afa6 output typo fixes: unknow --> unknown
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10398 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-09 01:30:24 +00:00
albeu
c193b910c0 Exit when the option parser return M_OPT_EXIT
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9793 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-04-02 16:13:16 +00:00
albeu
27d79717d4 Remove the hack used to pass -dvd, etc into the playlist
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9748 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-03-30 17:08:35 +00:00
arpi
d7c51f1ad3 Ok, firstly fixed the bug in parser-mpcmd.c where it
would accept a non-interger as an argument for -loop
(beginning of cmdline)..and have made it print an
error the same as when you pass a non-int to -loop
(end of cmdline) (parsed in different places).
patch by Alex Sisson <alex_sisson@yahoo.co.uk>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9107 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-26 16:11:35 +00:00
arpi
f10afcba44 2*10l=20l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8459 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-15 17:05:35 +00:00
diego
caf9c87669 -rnd --> -shuffle
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8453 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-15 04:47:32 +00:00
arpi
61c6ca5e6b more i+1<argc checks
patch by "Puk Madick" <pingy@swirvemail.com>, correction by Albeu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8427 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-11 20:56:37 +00:00
arpi
7caded971d 10l noticed by "Puk Madick" <pingy@swirvemail.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8401 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-12-07 20:59:33 +00:00
albeu
b3044d0feb Basic support for random playing (-rnd and -nornd)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8176 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 23:41:32 +00:00
albeu
126725660d New config system + cleanup of header inter dependency
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8165 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-11-12 01:56:42 +00:00