summaryrefslogtreecommitdiffstats
path: root/m_option.c
Commit message (Collapse)AuthorAgeFilesLines
* options: remove unused "func_full" option typeUoti Urpala2011-01-311-29/+2
| | | | | | vo_zr was the last user of the "func_full" option type. I think it's better if future features are implemented using more straightforward option functionality. Delete the func_full implementation.
* options: add special -leak-report optionUoti Urpala2011-01-151-1/+1
| | | | | | | | | | | | Add a special option "-leak-report" that enables talloc leak reporting. It only works if it's given as the first argument. The code abuses the CONF_TYPE_PRINT option type to make main option parsing ignore the option. The parser incorrectly consumed the following commandline argument as a "parameter" for options of this type when they had the flag to not exit after printing the message. Fix this. It makes no difference for any previously existing option I think.
* Merge branch 'hr-seek'Uoti Urpala2010-12-201-0/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hr-seek: input: add default keybindings Shift+[arrow] for small exact seeks input: support bindings with modifier keys for X input core: audio: make ogg missing audio timing workaround more complex core: add support for precise non-keyframe-limited seeks core: add struct for queued seek info commands: add generic option -> property wrapper options: add "choice" option type, use for -pts-association-mode core: remove looping in update_video(), modify command handling a bit core: seek: use accurate seek mode with audio-only files core: avoid using sh_video->pts as "current pts" libvo: register X11 connection fd in input event system core: timing: add special handling of long frame intervals core: move central play loop to a separate function Conflicts: DOCS/tech/slave.txt
| * options: add "choice" option type, use for -pts-association-modeUoti Urpala2010-12-181-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a "choice" option type. Options of this type take a string as input and set an int option variable to the value corresponding to the string. The string->int mapping is option-specific and is given in the option definition. Strings not found in the mapping are rejected as invalid option values. Change the option -pts-association-mode to use this new option type and accept values "auto, decoder, sort" instead of "0, 1, 2". The change in accepted values shouldn't cause problems as this option is not appropriate to use in normal user config files.
* | cosmetics: remove unused code, small formatting tweaksUoti Urpala2010-12-201-1/+1
|/
* cleanup: don't check for NULL before free()diego2010-11-081-6/+5
| | | | | | patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
* options: modify parse_timestring(), make publiccigaes2010-11-021-12/+16
| | | | | | | | Make the parse_timestring public, with a slightly extended API. As a consequence, "2 hours" is no longer recognized as a valid timestamp meaning "2 seconds". git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32514 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move code to avoid forward declarations in top-level .c filesdiego2010-11-021-19/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32421 b3059339-0415-0410-9bf9-f77b7e298cf2
* spelling fixessiretart2010-11-021-1/+1
| | | | | | | | | | Found by the Debian QA tool 'lintian' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31913 b3059339-0415-0410-9bf9-f77b7e298cf2 reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
* m_option.c: fix list termination with -*-pre optionsreimar2010-11-021-2/+4
| | | | | | | | Ensure that e.g. -af-pre will not cause the filter list to be unterminated when the list was empty before. Should fix bug #1687. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31559 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31141Uoti Urpala2010-05-071-0/+2
|\
| * Add support for 12-bit color mode on framebuffer devices.cehoyos2010-05-061-0/+2
| | | | | | | | | | | | | | Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
* | options: move -chapter values to option structUoti Urpala2010-04-251-0/+46
| | | | | | | | | | | | | | | | | | | | | | -chapter can optionally take a range with a start and an end. Add a new option type which supports such values and use that instead of a custom per-option function. This commit also fixes a build configuration bug: before the availability of the -chapter option depended on DVD functionality being enabled in the binary, even though the option works with other sources too.
* | Merge svn changes up to r30748Uoti Urpala2010-03-101-30/+30
|\|
| * Do not cast the results of malloc/calloc/realloc.diego2010-02-261-1/+1
| | | | | | | | | | | | | | | | 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
| * Make more option-parsing related function arguments const.reimar2010-02-251-29/+29
| | | | | | | | | | | | | | Prerequisite for making stream_open filename const in a proper way. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30737 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30475Uoti Urpala2010-03-091-0/+17
|\|
| * Add license header to all top-level files missing them.diego2010-01-301-0/+17
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make help text translatableUoti Urpala2010-03-071-1/+1
| | | | | | | | | | | | Translate help_text and also make all CONF_TYPE_PRINT option output translatable (though no translations exist yet for anything other than the main help text).
* | Merge svn changes up to r30301Uoti Urpala2010-01-251-1/+3
|\|
| * Add support for distinguishing between little- and big-endian SPDIF AC3reimar2010-01-111-1/+3
| | | | | | | | | | | | | | and converting between both. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30283 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30165Uoti Urpala2010-01-081-0/+11
|\|
| * Add support for YUV format with alpha and fix the codecs.conf entry for vp6areimar2009-12-311-0/+1
| | | | | | | | | | | | | | | | to use it. Fixes playback of samples in http://samples.mplayerhq.hu/FLV/flash_with_alpha/ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30157 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 16-bit per component YUV formats.reimar2009-12-311-0/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 440p colorspace.reimar2009-12-301-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30140 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29962Uoti Urpala2009-11-231-0/+3
|\|
| * Support 16-bit-per-component RGB formats (rgb48[bln]e) in option parser.reimar2009-11-211-0/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29942 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-54/+54
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-54/+54
| |
* | Merge svn changes up to r28862Uoti Urpala2009-03-071-5/+24
|\|
| * 100l, remove a pointless opt = NULL assignment that made print_int crash ↵reimar2009-03-031-1/+0
| | | | | | | | | | | | since r28794 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28803 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a 64 bit integer type to the suboption parser.reimar2009-03-021-1/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28794 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use strtoll in parse_int to avoid discrepancies between 32 and 64 bit systems.reimar2009-03-021-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28793 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Minor cosmetics: fix indentationreimar2009-03-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28792 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27899Uoti Urpala2008-11-061-1/+2
|\|
| * Avoid a potential memleak in parse_obj_params in case of a missingreimar2008-10-311-1/+2
| | | | | | | | | | | | m_ob_params_t part. Fixes bug #1318. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27869 b3059339-0415-0410-9bf9-f77b7e298cf2
* | options: Fix multiple -v by simplifying CONF_TYPE_FUNCUoti Urpala2008-04-261-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | options: Remove "reset" functionality from CONF_TYPE_FUNC[_PARAM]Uoti Urpala2008-04-261-3/+0
|/ | | | | | 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.
* typo: begining --> beginningdiego2007-12-231-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25517 b3059339-0415-0410-9bf9-f77b7e298cf2
* Option print functions may not and do not modify valuereimar2007-12-021-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25257 b3059339-0415-0410-9bf9-f77b7e298cf2
* correct const usage in the option handling code so that tables can berfelker2007-11-091-78/+78
| | | | | | | 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
* Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpyreimar2007-07-051-4/+5
| | | | | | | instead of plain strlcat/strlcpy git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23723 b3059339-0415-0410-9bf9-f77b7e298cf2
* mjpeg support for v4l2 tv:// drivervoroshil2007-06-011-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23441 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a print function for the time option type.albeu2007-05-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23433 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove C99-ism (mixed declaration and code),gpoirier2007-02-281-1/+3
| | | | | | | | 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
* Move parsing of the -ss option to the option code.uau2007-02-241-11/+48
| | | | | | | Also fixes a memory leak of the parameter string. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22330 b3059339-0415-0410-9bf9-f77b7e298cf2
* str_list separator backslash-escapingreimar2007-02-051-10/+18
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22151 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get rid of useless last_ptr assignmentreimar2007-02-041-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22124 b3059339-0415-0410-9bf9-f77b7e298cf2
* \, escapingmichael2006-10-201-1/+8
| | | | | | | 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
* Avoid memleak when calling parse_obj_params only for syntax-checking (dst == ↵reimar2006-10-081-1/+1
| | | | | | NULL) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20107 b3059339-0415-0410-9bf9-f77b7e298cf2
* Another != NULL check after dereferencingreimar2006-10-081-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20104 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix variable dereference before NULL check.reimar2006-10-081-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20103 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix broken parse_time_size, it would cause MPlayer to parse its parameter twice,reimar2006-09-291-15/+12
| | | | | | | 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
* after a long time, finally i could add -endpos option to mplayer executable.ptt2006-09-251-0/+72
| | | | | | | | 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
* Get rid of two initialized but unused variablesreimar2006-08-091-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19364 b3059339-0415-0410-9bf9-f77b7e298cf2
* introduce new 'stream' directory for all stream layer related components and ↵ben2006-07-311-1/+1
| | | | | | split them from libmpdemux git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19277 b3059339-0415-0410-9bf9-f77b7e298cf2
* marks some read-only char* inside structs as const, patch by Stefan Huehner, ↵reynaldo2006-07-271-2/+2
| | | | | | stefan At huehner-org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19199 b3059339-0415-0410-9bf9-f77b7e298cf2
* marks several string parameters as const, as they are not modified inside ↵reynaldo2006-07-131-3/+3
| | | | | | 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
* Remove unused variables, patch by Stefan Huehner stefan at huehner org.diego2006-07-081-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18963 b3059339-0415-0410-9bf9-f77b7e298cf2
* rm unnecesary casts from void* - part 3reynaldo2006-07-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18884 b3059339-0415-0410-9bf9-f77b7e298cf2
* rm unnecesary void* casts - part 1reynaldo2006-07-011-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18874 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not parse numbers as octal, strip leading zeroes instead.reimar2006-06-151-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18721 b3059339-0415-0410-9bf9-f77b7e298cf2
* Doxygen attack!albeu2006-04-241-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18259 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get ride of the several if(identify) messy lines and rearangment of some of ↵reynaldo2006-04-241-2/+1
| | | | | | 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
* Small fix with object list (-vf) help.albeu2006-03-151-2/+8
| | | | | | | | | | 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
* Make -xy help output consistent, output an empty line before and after.diego2006-03-041-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17728 b3059339-0415-0410-9bf9-f77b7e298cf2
* use calloc instead of malloc in copy_func_pf, missing initialization ofreimar2006-02-221-1/+1
| | | | |