summaryrefslogtreecommitdiffstats
path: root/etc/example.conf
Commit message (Collapse)AuthorAgeFilesLines
* player: redo how stream caching and pausing on low cache workswm42014-08-271-1/+1
| | | | | | | | | | | | | | | | | | | Add the --cache-secs option, which literally overrides the value of --demuxer-readahead-secs if the stream cache is active. The default value is very high (10 seconds), which means it can act as network cache. Remove the old behavior of trying to pause once the byte cache runs low. Instead, do something similar wit the demuxer cache. The nice thing is that we can guess how many seconds of video it has cached, and we can make better decisions. But for now, apply a relatively naive heuristic: if the cache is below 0.5 secs, pause, and wait until at least 2 secs are available. Note that due to timestamp reordering, the estimated cached duration of video might be inaccurate, depending on the file format. If the file format has DTS, it's easy, otherwise the duration will seemingly jump back and forth.
* example.conf: demuxer-thread is now enabled by defaultwm42014-08-191-3/+2
| | | | Provide a more useful example instead.
* etc/example.conf: update cache optionswm42014-08-091-4/+10
| | | | | | | Some of them changed semantics or got renamed. Note that the replacements in the example.conf are not necessarily the equivalents of the replaced options.
* manpage: update config file locationswm42014-06-281-1/+1
| | | | Also add some explanations how the config paths are determined.
* etc/example.conf: add example options for multichannel audiowm42014-05-161-1/+9
|
* etc/example.conf: minor adjustmentswm42014-05-161-2/+3
|
* etc/example.conf: remove spaces between key and valuewm42014-05-161-9/+9
| | | | | Currently, they are allowed, but only because MPlayer happened to do that. This might or might not be changed in the future.
* options: rename subtitle-related optionsMartin Herkt2014-05-041-1/+1
| | | | | | | | | --ass → --sub-ass --autosub → --sub-auto --autosub-match → --sub-auto-match --sub → --sub-file --subcp → --sub-codepage --subfps → --sub-fps
* example.conf: change subtitle codepage example to use UTF-8 fallbackwm42014-02-231-1/+2
| | | | This should be pretty safe compared to forcing the codepage.
* example.conf: subtitle encodingYaser Alraddadi2014-02-231-0/+3
| | | | | | Signed-off-by: wm4 <wm4@nowhere> Closes #580.
* example.conf: add example for disabling the OSCwm42013-10-141-0/+3
|
* example.conf: some modificationswm42013-09-071-23/+22
| | | | | | Remove options which are too obscure and most likely not very useful in general, or update them to something more modern. Add some comments about how configuration files work in general.
* video: redo hw decoding initialization, add --hwdec=autowm42013-08-111-1/+8
| | | | | | | | | | | | | | | | Change how the HW decoding stuff is organized, the way it's initialized in particular. Instead of duplicating the list of supported codecs for hwaccel decoders, add a probe function which allows each decoder to report whether it supports a given codec. Add an "auto" choice to the --hwdec option, which automatically enables hardware decoding if libavcodec and/or the VO supports it. What mpv prints on the terminal changes a bit. Now it will just print a single line whether hw decoding is used or not (and nothing at all if no hw decoding at all was requested). The pretty violent fallback from hw decoding to software decoding is still quite verbose and evil-looking though.
* video: add --autofit and --autofit-larger optionswm42013-01-231-0/+3
| | | | | | | | | --autofit=WxH sets the window size to a maximum width and/or height, without changing the window's aspect ratio. --autofit-larger=WxH does the same, but only if the video size is actually larger than the window size that would result when using the --autofit=WxH option with the same arguments.
* video: different way to enable hardware decoding, add software fallbackwm42013-01-131-2/+2
| | | | | | | | | | | | | | Deprecate the hardware specific video codec entries (like ffh264vdpau). Replace them with the --hwdec switch, which requests that a specific hardware decoding API should be used. The codecs.conf entries will be removed at a later time, but for now they are useful for testing and compatibility. Instead of --vc=ffh264vdpau, --hwdec=vdpau should be used. Add a fallback if hardware decoding fails. Most hardware decoders (including vdpau) support only a subset of h264, and having such a fallback is supposed to enable a better user experience.
* example.conf: all options should be commentedwm42012-11-141-1/+1
| | | | | The file is written with the assumption that it doesn't change any settings by default. Add a forgotten comment to fix this.
* example.conf: remove some useless options, add some useful oneswm42012-11-111-45/+10
|
* Rename to "mpv"wm42012-10-121-3/+3
| | | | | | | | | | | | | | | | | | This changes the name of this project to mpv. Most user-visible mentions of "MPlayer" and "mplayer" are changed to "mpv". The binary name and the default config file location are changed as well. The new default config file location is: ~/.mpv/ Remove etc/mplayer.desktop. Apparently this was for the MPlayer GUI, which has been removed from mplayer2 ages ago. We don't have a logo, and the MS Windows resource files sort-of require one, so leave etc/mplayer.ico/.xpm as-is. Remove the debian and rpm packaging scripts. These contained outdated dependencies and likely were more harmful than useful. (Patches which add working and well-tested packaging are welcome.)
* Remove VESA/FBDEV remains, clean up example.confwm42012-09-181-40/+3
| | | | | | Remove VESA and FBDEV specific code that was forgotten when the respective VOs were removed. Remove references to old or broken stuff from example.conf.
* example.conf: add bandwidth examplemplayer-svn2012-08-031-0/+4
| | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34782 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: compn
* example.conf: Disambiguate remarks about profilesdiego2011-01-311-15/+19
| | | | | | | Also move the profiles to the bottom of the example configuration file as the original remarks in the file suggested. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32754 b3059339-0415-0410-9bf9-f77b7e298cf2
* example.conf: add some profile information and user-agent examplescompn2010-12-161-0/+16
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32709 b3059339-0415-0410-9bf9-f77b7e298cf2 add realplayer user-agent git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32712 b3059339-0415-0410-9bf9-f77b7e298cf2 add winamp useragent example git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32713 b3059339-0415-0410-9bf9-f77b7e298cf2
* add spdif example from beandogcompn2009-12-151-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30041 b3059339-0415-0410-9bf9-f77b7e298cf2
* vdpau codecs config entry by beandogcompn2009-12-091-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29987 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix apple.com trailer example, via carlcompn2009-12-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29975 b3059339-0415-0410-9bf9-f77b7e298cf2
* add user-agent example to fix apple.com/trailerscompn2009-11-261-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29967 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a profile example and (commented-out) useful defaults for dvdnavreimar2009-11-051-0/+3
| | | | | | | to example.conf git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29825 b3059339-0415-0410-9bf9-f77b7e298cf2
* example for setting WMP user-agent string, helps when playlistsreimar2008-02-081-0/+4
| | | | | | | | and media (streamed via mms) use the same URL (what an ugly case of user-agent misuse!) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25961 b3059339-0415-0410-9bf9-f77b7e298cf2
* set -vc=ffmpeg12 as dvdnav prefered decoderben2008-01-251-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25851 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename the default GUI skins directory from 'Skin' to 'skins', keepingdiego2006-03-271-1/+1
| | | | | | | backwards compatibility. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17975 b3059339-0415-0410-9bf9-f77b7e298cf2
* Put settings into a more meaningful order, some cosmetics.diego2006-01-171-53/+52
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17417 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improve option descriptions.diego2006-01-171-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17416 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove multi-language setting specification, it has little use.diego2006-01-171-15/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17415 b3059339-0415-0410-9bf9-f77b7e298cf2
* Improve option descriptions.diego2006-01-171-28/+20
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17414 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetic whitespace / layout changesdiego2006-01-161-96/+92
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17413 b3059339-0415-0410-9bf9-f77b7e298cf2
* Comment out default settings. MPlayer should behave the same w/ or w/odiego2006-01-161-4/+4
| | | | | | | the default configuration file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17411 b3059339-0415-0410-9bf9-f77b7e298cf2
* Smarter defaults, removing obsolete options.diego2005-11-291-18/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17061 b3059339-0415-0410-9bf9-f77b7e298cf2
* -aop is long obsolete.diego2005-11-281-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17060 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. -cache-prefil has not been renamed, it's been removed (-cache-seek-minrathann2005-08-231-2/+2
| | | | | | | | | | is a new option) 2. the default value is 50 not 5 noticed by iive git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16297 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache-prefill has been renamed to cache-seek-min, example config shouldrathann2005-08-201-1/+1
| | | | | | | reflect this git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16279 b3059339-0415-0410-9bf9-f77b7e298cf2
* options in config file have been using '-' instead of '_' for agesrathann2005-03-031-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14894 b3059339-0415-0410-9bf9-f77b7e298cf2
* reorganized, reformatted, explanation improved, typos, wordingdiego2004-07-201-70/+96
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12876 b3059339-0415-0410-9bf9-f77b7e298cf2
* cache min fill adjustment, based on patch by Jeremy Huddlestoniive2004-07-161-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12836 b3059339-0415-0410-9bf9-f77b7e298cf2
* swedish yes/no options supportwight2004-01-131-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11786 b3059339-0415-0410-9bf9-f77b7e298cf2
* polish yes/no options supportwight2004-01-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11782 b3059339-0415-0410-9bf9-f77b7e298cf2
* runtime 'stay-on-top' functionalityjoey2003-11-301-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11543 b3059339-0415-0410-9bf9-f77b7e298cf2
* _ ---> - in -monitor* optionsdiego2003-10-271-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11292 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, this is very badrfelker2003-05-141-6/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10105 b3059339-0415-0410-9bf9-f77b7e298cf2
* path fixgabucino2002-12-071-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8399 b3059339-0415-0410-9bf9-f77b7e298cf2
* documenting vesa 3 / GTF configarpi2002-10-071-6/+8
| | | | | | | patch by Rudolf Marek <MAREKR2@cs.felk.cvut.cz> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7652 b3059339-0415-0410-9bf9-f77b7e298cf2
* some obsolete stuff removedgabucino2002-10-061-14/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7643 b3059339-0415-0410-9bf9-f77b7e298cf2
* (no)dshow option removedgabucino2002-05-051-3/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5979 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed some left master/pcmgabucino2002-04-061-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5501 b3059339-0415-0410-9bf9-f77b7e298cf2
* sok ize, mutyur, bizbasz.gabucino2002-02-121-0/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4681 b3059339-0415-0410-9bf9-f77b7e298cf2
* not "us", but "en" - missed previouslygabucino2001-12-271-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3815 b3059339-0415-0410-9bf9-f77b7e298cf2
* added alang,slang optionsgabucino2001-12-261-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3777 b3059339-0415-0410-9bf9-f77b7e298cf2
* eh forgot about ffmpeg12 :<gabucino2001-12-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3620 b3059339-0415-0410-9bf9-f77b7e298cf2
* *** empty log message ***gabucino2001-12-181-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3574 b3059339-0415-0410-9bf9-f77b7e298cf2
* -cache added as default (8192)gabucino2001-12-031-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3290 b3059339-0415-0410-9bf9-f77b7e298cf2
* busted. szopjatok hanyatt users.gabucino2001-10-221-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2368 b3059339-0415-0410-9bf9-f77b7e298cf2
* *** empty log message ***gabucino2001-10-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2367 b3059339-0415-0410-9bf9-f77b7e298cf2
* stuff.. (sorry, forgot:P)gabucino2001-10-211-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2335 b3059339-0415-0410-9bf9-f77b7e298cf2
* added matrox fullscreen/aspect tvout stuffgabucino2001-10-201-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2321 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_vesa added to 'zoom'gabucino2001-10-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2300 b3059339-0415-0410-9bf9-f77b7e298cf2
* ide vmi nagy hulyeseget akartam irni de elfelejtettemgabucino2001-10-171-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2241 b3059339-0415-0410-9bf9-f77b7e298cf2
* szakattam vagy nemtomgabucino2001-10-151-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2212 b3059339-0415-0410-9bf9-f77b7e298cf2
* minor additions/fixesgabucino2001-09-181-9/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1918 b3059339-0415-0410-9bf9-f77b7e298cf2
* -skin optiongabucino2001-09-071-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1866 b3059339-0415-0410-9bf9-f77b7e298cf2
* *** empty log message ***gabucino2001-08-221-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1625 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/codecs.conf -> etc/codecs.confarpi2001-08-211-0/+124
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1615 b3059339-0415-0410-9bf9-f77b7e298cf2