Commit Graph

84 Commits

Author SHA1 Message Date
Uoti Urpala 0eb321bf2c Remove trailing whitespace from most files 2009-07-07 02:34:35 +03:00
Uoti Urpala e0172b96e3 Merge svn changes up to r28862 2009-03-07 01:04:41 +02:00
reimar 2e1f8e3670 100l, remove a pointless opt = NULL assignment that made print_int crash since r28794
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28803 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-03 18:12:03 +00:00
reimar 39bb720ef8 Add a 64 bit integer type to the suboption parser.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28794 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-02 11:17:50 +00:00
reimar b9102d0b06 Use strtoll in parse_int to avoid discrepancies between 32 and 64 bit systems.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28793 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-02 11:10:11 +00:00
reimar 3dbe44fc07 Minor cosmetics: fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28792 b3059339-0415-0410-9bf9-f77b7e298cf2
2009-03-02 11:06:05 +00:00
Uoti Urpala e46ce9c0ac Merge svn changes up to r27899 2008-11-06 20:41:40 +02:00
reimar aa589da439 Avoid a potential memleak in parse_obj_params in case of a missing
m_ob_params_t part. Fixes bug #1318.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27869 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-31 12:59:17 +00:00
Uoti Urpala 6be229cbbf options: Fix multiple -v by simplifying CONF_TYPE_FUNC
The CONF_TYPE_FUNC implementation counted how many times the option
had appeared and called the function that many times when it was set.
However each -v on the command line triggered an increase of the count
_and_ as many calls as the current count indicated. Thus the resulting
verbosity levels for 0 to 5 -v were really 0, 1, 3, 6, 10, 15 instead
of 0, 1, 2, 3, 4, 5.

Remove the counting functionality and just call the given function
once at each set operation. This fixes -v; other options are not
affected.
2008-04-26 09:40:35 +03:00
Uoti Urpala 98b959ae1f options: Remove "reset" functionality from CONF_TYPE_FUNC[_PARAM]
The "reset to default before setting to something else" functionality
is not used by any current option, but prevents using the "priv" field
of the option data for anything else.
2008-04-26 09:40:34 +03:00
diego e91fc44d4c typo: begining --> beginning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25517 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-23 21:22:02 +00:00
reimar 2e18988a04 Option print functions may not and do not modify value
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25257 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 15:56:38 +00:00
rfelker 452c2c5652 correct const usage in the option handling code so that tables can be
declared const and moved from .data to .text/rodata sections.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24994 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-09 06:50:53 +00:00
reimar 4c4a1070fe Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
instead of plain strlcat/strlcpy


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23723 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-05 22:01:07 +00:00
voroshil cc5ea363f8 mjpeg support for v4l2 tv:// driver
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23441 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-01 17:29:35 +00:00
albeu 67341d23fa Add a print function for the time option type.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23433 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-31 12:37:37 +00:00
gpoirier 2793a70e0f remove C99-ism (mixed declaration and code),
10l to Uoti Urpala for breaking GCC-2.95 support yet again even though any post-2.95 GCC version print a clear warning about it
Patch by Carl Eugen Hoyos % cehoyos A ag P or P at %


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22374 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-28 09:18:42 +00:00
uau e5ab09bb64 Move parsing of the -ss option to the option code.
Also fixes a memory leak of the parameter string.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22330 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-24 07:11:57 +00:00
reimar e2e0d90912 str_list separator backslash-escaping
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22151 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 18:03:12 +00:00
reimar ae912aee0d Get rid of useless last_ptr assignment
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22124 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-04 11:58:29 +00:00
michael 4375571265 \, escaping
applying my own patch due to lack of anyone objecting to it and as its pretty much needed for -vf geq


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20320 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 16:42:36 +00:00
reimar d118552100 Avoid memleak when calling parse_obj_params only for syntax-checking (dst == NULL)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20107 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 09:43:18 +00:00
reimar 32ddb1bb28 Another != NULL check after dereferencing
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20104 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 09:10:55 +00:00
reimar ab39d95f53 Fix variable dereference before NULL check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20103 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-08 09:07:51 +00:00
reimar 798b104801 Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,
e.g. "mplayer file -endpos 01" would try to play the file "01", too


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20009 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-29 23:23:41 +00:00
ptt 928da7a448 after a long time, finally i could add -endpos option to mplayer executable.
as oded told me on 1006 02 24, i applied it, blame me if some problem occurs,
i hope not, since i tried it for a while....


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19979 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-25 16:47:56 +00:00
reimar 2fdc1e9a8e Get rid of two initialized but unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19364 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-09 16:52:48 +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 db5487225c marks some read-only char* inside structs as const, patch by Stefan Huehner, stefan At huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19199 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-27 17:35:06 +00:00
reynaldo 1a16cbfec3 marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19058 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 05:03:43 +00:00
diego a356cbcc01 Remove unused variables, patch by Stefan Huehner stefan at huehner org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-08 17:28:36 +00:00
reynaldo 3afd65b3af rm unnecesary casts from void* - part 3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18884 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-02 08:17:07 +00:00
reynaldo 5b4ec50d44 rm unnecesary void* casts - part 1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18874 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-01 03:56:13 +00:00
reimar f3f1509ba9 Do not parse numbers as octal, strip leading zeroes instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18721 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-15 08:09:03 +00:00
albeu f0f01dd903 Doxygen attack!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18259 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 19:20:04 +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
albeu 122744d6ed Small fix with object list (-vf) help.
Tell the user when an object have no option description instead of
falling back to the "normal" help, like with -vf pp=help.
Don't display a useless error message when querying the help of
an object option (as in -vf scale=presize=help).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17875 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-15 17:16:13 +00:00
diego 1cbeb57911 Make -xy help output consistent, output an empty line before and after.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17728 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-04 17:33:56 +00:00
reimar 2e51fd4440 use calloc instead of malloc in copy_func_pf, missing initialization of
next field caused crash (fixes bug #459)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17668 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-22 20:39:44 +00:00
albeu eed2e8e820 New option type to print help text with a function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17471 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-24 11:14:13 +00:00
albeu 97740de423 Fix misuse of the M_OPT_TYPE_INDIRECT flag, it has nothing to do
with the type of data used by the option.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17469 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-23 12:15:22 +00:00
rfelker 97f2d88db0 fix incorrect use of strl* functions (patch by reimar)
(unknown suboption "cop" with -oac copy, etc)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16855 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-25 17:28:10 +00:00
reimar 169416fd51 Use PRI?64 defines as format strings for 64 bit variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16751 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-13 18:33:56 +00:00
reimar 9474719abe Add support for suboption escaping via both "" and %n%str syntax
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16742 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-12 16:35:37 +00:00
reimar 70f2321ae8 Do not define NO_FREE, it causes a giant memleak with -loop 0 and a short file.
If this causes problems these should be fixed instead of using this hack.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16426 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-07 00:19:04 +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
gpoirier 9dd8f241ac adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15790 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-20 23:07:35 +00:00
reimar 8193073010 Fix crash with e.g. -vf scale=::
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15744 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-17 08:15:08 +00:00
nicodvb 1cb05c0cfa introduced -string- parameter to match everything after :// syntax
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15461 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-14 12:49:18 +00:00
alex cd9e4753d7 CONF_TYPE_AFMT similar to CONF_TYPE_IMGFMT
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14247 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-27 17:32:54 +00:00