summaryrefslogtreecommitdiffstats
path: root/cfg-common-opts.h
Commit message (Collapse)AuthorAgeFilesLines
* cfg-common*: Replace common options template by a common options arraydiego2010-11-021-360/+0
| | | | | | | | | This solution works just as well, but avoids a separate template file that needs to be #included from multiple places. The end result is simpler since common options and those of MPlayer and MEncoder are now in only one file each. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31434 b3059339-0415-0410-9bf9-f77b7e298cf2
* rtsp: Support RTSP/RTP over HTTP via LIVE555cehoyos2010-11-021-0/+3
| | | | | | | | | | Patch by Malte Särner, malte D sarner A multiq se git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31347 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix compilation with nemesi and live555. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31348 b3059339-0415-0410-9bf9-f77b7e298cf2
* Merge svn changes up to r31291Uoti Urpala2010-06-021-1/+1
|\
| * Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it.diego2010-05-301-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31291 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a referrer option to set the HTTP Referer field.reimar2010-05-301-0/+1
| | | | | | | | | | | | | | Patch by chocolateboy [chocolate cpan org] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31288 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the -a52drc option also for the libavcodec decoder.reimar2010-05-301-6/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31286 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove some commented-out duplicate option entries.diego2010-05-251-4/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31214 b3059339-0415-0410-9bf9-f77b7e298cf2
* | options: move -a52drc to option structUoti Urpala2010-06-021-3/+1
| | | | | | | | Also allow a range up to 2.
* | options: move -alang and -slang to option structUoti Urpala2010-05-221-6/+4
| | | | | | | | | | | | | | The option field corresponding to -slang is now called "sub_lang" instead of the old misleading global name "dvdsub_lang". The code handling -slang in subreader.c looks rather broken; disable it instead of converting it to use the option field.
* | Merge svn change r31134Uoti Urpala2010-05-071-235/+231
|\| | | | | | | Fix some search/replace errors introduced in the svn commit.
| * the great MPlayer tab removal: part IIdiego2010-05-031-241/+241
| | | | | | | | | | | | | | some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30967Uoti Urpala2010-04-261-2/+0
|\|
| * Move SetCodecPath() from loader to get_path.c and make it unconditional.diego2010-03-201-2/+0
| | | | | | | | | | | | | | | | This fixes compilation with the Win32 loader disabled but other binary codec loaders enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30942 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30907Uoti Urpala2010-04-261-0/+3
|\|
| * Add -codecpath option.komh2010-03-151-0/+3
| | | | | | | | | | | | | | | | It allows to search binary codecs in non-standard directories. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30897 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare externally used variables from vd.c as extern in vd.h.diego2010-02-221-1/+1
| | | | | | | | | | | | | | This saves declaring them as extern all over the place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
* | options: move -chapter values to option structUoti Urpala2010-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | -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 r30475Uoti Urpala2010-03-091-0/+18
|\|
| * Add license header to all top-level files missing them.diego2010-01-301-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Disable libass fallbacks for fontconfig < 2.4.2Grigori Goronzy2010-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | libass doesn't support fontconfig < 2.4.2 so fallbacks for these ancient versions aren't needed anymore. Also update the man page (English, German) to reflect the change. Additionally note that -embeddedfonts controls the use of ASS script embedded fonts too. -embeddedfonts is now always enabled by default. Fonts are never extracted into a directory anymore but passed to libass via memory.
* | Support for multiple editions in MatroskaDaniel Dawson2009-12-041-0/+1
| | | | | | | | | | | | | | | | Add code to intelligently choose an appropriate Matroska edition when there are several. Will choose, in descending order of preference: the edition chosen by the user through the option "-edition <edition id>" if it exists, the first edition with EditionFlagDefault set to 1 if there is one, or the first edition.
* | options: Move ass_enabled to options structUoti Urpala2009-12-021-2/+2
| |
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-1/+1
|\|
| * Add support for 8 channel audio.tack2009-11-101-1/+1
| | | | | | | | | | | | | | | | Where 8 channel support is non-trivial (e.g. ao_dsound), at least ensure we fail gracefully. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29868 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-3/+4
|\| | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * Add a -nosub option that allows disabling auto-selected subtitles as e.g. thereimar2009-09-281-0/+1
| | | | | | | | | | | | | | mkv demuxer supports. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29730 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow -1 and -2 values for -aid, -vid and -sid (meaning "auto" and ↵reimar2009-09-281-3/+3
| | | | | | | | | | | | "disabled" respectively). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29729 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Uoti Urpala2009-08-181-1/+1
|\|
| * Improve wording for missing sctp supportlu_zero2009-08-031-1/+1
| | | | | | | | | | | | | | | | You need libnemesi in order to get -rtsp-stream-over-sctp git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29472 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29412Uoti Urpala2009-07-071-4/+8
|\|
| * CONFIG_LIBNEMESI and CONFIG_LIVE555 are not defined to 0/1 values.diego2009-06-031-2/+2
| | | | | | | | | | | | | | | | Thus, we cannot check for them in an #if directive, but have to use #if defined() instead. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29345 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Unify over rtsp_transport_tcp as var to hold the -rtsp-stream-over-tcp flag ↵lu_zero2009-05-251-1/+1
| | | | | | | | | | | | and make sure libnemesi only builds are fine git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29322 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure -rtsp-stream-with-sctp is supported while building with libnemesilu_zero2009-05-251-4/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29321 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-8/+8
| |
* | Merge svn changes up to r28537Uoti Urpala2009-02-121-1/+1
|\|
| * Add priority support for OS/2 and factorize the Windows priority support.diego2009-02-101-1/+3
| | | | | | | | | | | | | | patch by KO Myung-Hun, komh chollian net git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28520 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-151-0/+1
|\| | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * added support for manual audio substream selection out of 0xFD PES streams ↵nicodvb2009-01-041-0/+1
| | | | | | | | | | | | (Blueray, multistream in the same pid) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28245 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28204Uoti Urpala2008-12-271-0/+1
|\|
| * Add nomsgmodule option, patch by Onur Küçük, onur delipenguen net.diego2008-12-241-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28192 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to 27824Uoti Urpala2008-10-251-1/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Add -nomsgcolor option to match -msgcolor, patch by swell.k gmail com.diego2008-10-161-0/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27789 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace preprocessor check for WIN32 with checks for __MINGW32__ and __CYGWIN__.diego2008-10-131-1/+1
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-18/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-071-7/+7
| | | | | | | | | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename font-related preprocessor directives.diego2008-08-071-7/+7
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename a bunch of miscellaneous preprocessor directives.diego2008-08-071-1/+1
| | | | | | | | | | | | | | Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change a bunch of video/audio-output-specific preprocessor directives fromdiego2008-08-031-3/+3
| | | | | | | | | | | | | | a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27399Uoti Urpala2008-08-021-5/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
| * Change a bunch of codec-specific preprocessor directives from a HAVE_diego2008-08-021-1/+1
| | | | | | | | | | | | | | prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27395 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove checks for HAVE_XVID3, that conditional was removed a long time ago.diego2008-08-021-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27394 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;diego2008-08-011-4/+4
| | | | | | | | | | | | | | 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
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-19/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Start unifying names of internal preprocessor directives.diego2008-07-301-19/+19
| | | | | | | | | | | | | | | | 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
* | Silence "discards qualifiers" warnings when compiling mplayer.cUoti Urpala2008-04-261-11/+11
| | | | | | | | | | | | | | | | | | | | Add casts to subconfig entries in option lists to avoid the excessive amount of "initialization discards qualifiers from pointer target type" warnings. Also add const to the type of mpctx_get_audio_out to eliminate a warning and make it match the type in the header (svn r25793 had added a const to the header but not mplayer.c). Make libmenu_vfs a table of pointers to const to eliminate another warning plus make the table itself const.
* | Move global mconfig to mpctxUoti Urpala2008-04-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | 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.
* | Move vf_settings to options structUoti Urpala