summaryrefslogtreecommitdiffstats
path: root/DOCS
Commit message (Collapse)AuthorAgeFilesLines
* options: add "choice" option type, use for -pts-association-modeUoti Urpala2010-12-181-4/+5
| | | | | | | | | | | | | 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.
* ao_pcm: change message to mention "-novideo" instead of "-vc null"Uoti Urpala2010-12-081-1/+1
| | | | | | | | | -novideo is the right way to disable video, and should also work in more cases now that lavf is used as the default demuxer for more formats (like AVI; internal AVI demuxer fails with -novideo). Also change the man page description of -novideo a bit to make it sound less negative about the chances of the option working.
* core: ordered chapters: add heuristic for merging inaccurate chaptersUoti Urpala2010-11-261-0/+11
| | | | | | | | | | Some Matroska files have inaccurate ordered chapter endpoints, and so parts where one chapter should end and the next begin at the same timestamp were not merged. This resulted in an unnecessary seek over a minimal distance. Add a heuristic to merge parts with a minimal gap or overlap between them. Based on patch by Hector Martin <hector@marcansoft.com>.
* sub_cc: Allow selecting the Close Captioning channelreimar2010-11-141-2/+2
| | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32607 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32608 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/tech/codecs.conf.txt: document how to add ffmpeg codecscompn2010-11-141-0/+40
| | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32604 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32615 b3059339-0415-0410-9bf9-f77b7e298cf2
* core: do initial A-V sync by modifying audio streamUoti Urpala2010-11-131-0/+11
| | | | | | | Add code to enforce matching pts with video when (re)starting the audio stream, by either cutting away the first samples or inserting silence at the beginning. New option -noinitial-audio-sync can be used to disable this and return to old behavior.
* audio: add -gapless-audio optionUoti Urpala2010-11-121-0/+11
| | | | | | | | | If the option is enabled and all audio has been buffered to the AO, then the player will move to the next file without waiting for the buffered audio to drain, while leaving the AO initialized. If the playback of the next file starts quickly enough (before the AO buffer empties) then it should continue writing audio to the same AO with no gap in between.
* DOCS/man/zh_CH: sync with en/mplayer.1 rev. 32566jrash2010-11-071-3/+123
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32567 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_stereo3d: Add stereo3d filterreimar2010-11-022-0/+193
| | | | | | | | | Further review very welcome, but it is time (and good enough) to add this. Patch by Gordon Schmidt [gordon.schmidt s2000.tu-chemnitz de] with changes by Endre Kollár [taxy443 gmail com]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32527 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a simple capture feature (-capture)Uoti Urpala2010-11-022-1/+21
| | | | | | | | | | | | | | | | | If a specified key is pressed during playback, the current stream is captured to a file, similar to what -dumpstream achieves. original patch by Pásztor Szilárd, don tricon hu Taken from the following svn commits, but with several fixes and modifications (one obvious user-visible difference is that the default key binding is 'C', not 'c'): git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32524 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32529 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32530 b3059339-0415-0410-9bf9-f77b7e298cf2
* manpage: Make commas and backslashes show properlyattila2010-11-026-6/+6
| | | | | | patch by Rudolf Polzer (divVerent) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32519 b3059339-0415-0410-9bf9-f77b7e298cf2
* new slave command: af_cmdline, for changing audio filter optionsreimar2010-11-021-0/+3
| | | | | | | | | Add experimental af_cmdline slave command to allow changing filter options at runtime. Patch by Adrian Stutz [adrian sttz ch] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32505 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man: Add missing values for the chanlist suboption of -tvdiego2010-11-029-9/+27
| | | | | | patch by Giorgio Vazzana, mywing81 gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32447 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml/hu: synced with r32361Gabrov2010-11-025-67/+133
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32362 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: Remove outdated warning about obsolete gcc 2.96.diego2010-11-021-5/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32283 b3059339-0415-0410-9bf9-f77b7e298cf2
* build: update DirectFB requirements, reduce #ifdefsdiego2010-11-021-2/+2
| | | | | | | | | | | | | | | | | | Require DirectFB version 0.9.15 instead of 0.9.13. This simplifies the build system at the cost of requiring a library version that was released at the end rather than the middle of 2002. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32251 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify DirectFB check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32252 b3059339-0415-0410-9bf9-f77b7e298cf2 Require DirectFB version 0.9.22. This allows getting rid of a lot of library version check #ifdeffery. Release 0.9.22 is from February 2005, so the requirement is reasonable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32253 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zh_CN: Synced with rev. 32066jrash2010-11-021-4/+45
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32130 b3059339-0415-0410-9bf9-f77b7e298cf2
* manpage: Clarify the meaning of the -nosub optionreimar2010-11-021-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32014 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: edit TV/radio chaptersdiego2010-11-0240-3152/+3401
| | | | | | | | | | | | | | | | | | | | Remove empty paragraph from TV input chapter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31977 b3059339-0415-0410-9bf9-f77b7e298cf2 Merge TV input and TV teletext chapter into the usage chapter. This improves the overall structure of the documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31978 b3059339-0415-0410-9bf9-f77b7e298cf2 Restore mistakenly removed TV input chapter introduction. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31979 b3059339-0415-0410-9bf9-f77b7e298cf2 Merge radio chapter into the usage chapter. This improves the overall structure of the documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31980 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: Merge CD/DVD chapter into the usage chapterdiego2010-11-0230-2882/+2852
| | | | | | | | | | | This improves the overall structure of the documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31970 b3059339-0415-0410-9bf9-f77b7e298cf2 Merge CD/DVD chapter into the usage chapter for all translations. This improves the overall structure of the documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31971 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml/zh_CN: replace usage.xml symlink to English with copydiego2010-11-021-1/+1123
| | | | | | | | | | | | Remove usage.xml symlink in the Chinese documentation translation. It will be replaced with the English text in a moment. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31965 b3059339-0415-0410-9bf9-f77b7e298cf2 Add copy of English usage.xml file to Chinese translation. This will be useful to merge other parts of the Chinese translation into it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31966 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: Remove pointless compilation sections from radio and TV input chaptersdiego2010-11-022-37/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31947 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: Integrate advanced audio usage sections into the general usage ↵diego2010-11-021-4/+0
| | | | | | | | chapter. This avoids an empty chapter that just contains sections. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31940 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: Remove bogus teletext hotkeys sectiondiego2010-11-026-224/+0
| | | | | | It is both wrong and misplaced. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31936 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31814jrash2010-11-021-3/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31867 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml/README: improvediego2010-11-021-37/+1
| | | | | | | | | | | The package list for Debian systems is not specific to the Sarge release. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31841 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove instructions for installing XML/XSL packages from source. This information is outside the scope of this README file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31842 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml/configure: misc changesdiego2010-11-021-75/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify xmllint test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31836 b3059339-0415-0410-9bf9-f77b7e298cf2 cosmetics: Drop leading underscores from variable names. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31837 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove unused variable fake_docbook_xsl. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31838 b3059339-0415-0410-9bf9-f77b7e298cf2 Adding XML entities for the English XML files to main.xml is enough. The English version is the master and will always be complete. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31839 b3059339-0415-0410-9bf9-f77b7e298cf2 cosmetics: Use more compact "if .. then" shell syntax. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31840 b3059339-0415-0410-9bf9-f77b7e298cf2 Simplify adding --catalogs option to xsltproc/xmllint command line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31843 b3059339-0415-0410-9bf9-f77b7e298cf2 Add an XML catalog search path that works for current macports systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31844 b3059339-0415-0410-9bf9-f77b7e298cf2 whitespace cosmetics: fix indentation git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31845 b3059339-0415-0410-9bf9-f77b7e298cf2 Skip searching for an xmllint command. The xmllint target is separate from building the documentation; thus if xmllint is not available, the xmllint targets can fail without further harm. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31846 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml/en/documentation.xml: mark MPlayer as GPL v2 onlydiego2010-11-021-3/+2
| | | | | | | Almost all files are v2+, but there are some bits of v2 only code left, so MPlayer as a whole is still v2 only. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31835 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/*/hu: synced with r31833Gabrov2010-11-028-492/+211
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31834 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: updatesdiego2010-11-025-433/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop one pointless subsectioning level from radio input chapter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31815 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove subsection that describes how to tweak CD/DVD drives. It is getting outdated and outside the scope of MPlayer documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31816 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove pointless and non-informative SDL section from video output chapter. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31817 b3059339-0415-0410-9bf9-f77b7e298cf2 Drop one level of pointless subsectioning. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31818 b3059339-0415-0410-9bf9-f77b7e298cf2 Split TV chapter in two. This avoids a chapter without content apart from the (sub)sections. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31819 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove MTRR section from video output chapter. The information it contains should be irrelevant in 2010. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31820 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove graphics cards subsections from Xv section in video output chapter. The information contained is very outdated. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31821 b3059339-0415-0410-9bf9-f77b7e298cf2
* manpage: don't claim teletext keys would depend on build optionsdiego2010-11-021-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31814 b3059339-0415-0410-9bf9-f77b7e298cf2
* manpage: Fix wrong option name in input examplereimar2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31813 b3059339-0415-0410-9bf9-f77b7e298cf2
* slave mode: Add stream_time_pos propertyreimar2010-11-021-0/+1
| | | | | | Patch by Paul Huwe [reicow yahoo com] with some modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31794 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31769jrash2010-11-021-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31774 b3059339-0415-0410-9bf9-f77b7e298cf2
* manpage: mention -af stats in -af volume section for statisticsreimar2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31769 b3059339-0415-0410-9bf9-f77b7e298cf2
* manpage: -af volume "max volume" feature requires floatsreimar2010-11-021-0/+2
| | | | | | Printing maximum volume only works when prefering float format. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31762 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31715jrash2010-11-021-1/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31745 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS: Fix a few web page links in the documentation.diego2010-11-024-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31744 b3059339-0415-0410-9bf9-f77b7e298cf2
* ao_coreaudio: Refactor device selectionadrian2010-11-021-0/+8
| | | | | | | | | | | Add output device selection and correctly set the default device if it's selected. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31715 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix cosmetics after r31715. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31716 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31648jrash2010-11-021-12/+67
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31652 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: remove "broken" comment from quadbuffer stereocehoyos2010-11-021-1/+1
| | | | | | | | | Independent tests indicate that GLX_STEREO is working fine on supported hardware. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31647 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31648 b3059339-0415-0410-9bf9-f77b7e298cf2
* manpage: Fix outdated -vo gl usage example.reimar2010-11-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31634 b3059339-0415-0410-9bf9-f77b7e298cf2
* vo_gl: Add initial stereo supportreimar2010-11-021-0/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31633 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/cs: Fix Bulgarian vs. Hungarian typo in Czech manual page.diego2010-11-021-1/+1
| | | | | | patch by Petr Vorel, pevik seznam cz git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31632 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream_bluray: add unencrypted Blu-ray playbackben2010-11-021-4/+29
| | | | | | | Support for unencrypted Blu-ray playback through libbluray. Use it through: mplayer br:////path/to/disc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31631 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/tech/slave.txt: Add disabling input to hintsreimar2010-11-021-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31595 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml/Makefile: Remove help target that prints available targetsdiego2010-11-021-16/+2
| | | | | | The Makefile should now be simple enough to understand without it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31583 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31552jrash2010-11-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31556 b3059339-0415-0410-9bf9-f77b7e298cf2
* manpage: improve "-identify" description of "-frames 0"attila2010-11-021-1/+1
| | | | | | | Make clear that -frames 0 surpresses all _video_ output and not the text output. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31552 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: Get rid of xsltproc wrapper redirectiondiego2010-11-022-24/+6
| | | | | | Run commands directly from make. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31538 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: Move xsltproc target file hack to the Makefile.diego2010-11-022-8/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31537 b3059339-0415-0410-9bf9-f77b7e298cf2
* configure: drop support for Jade/OpenJade/Saxon XSLT processorsdiego2010-11-022-129/+0
| | | | | | | | | | | | | | Drop configure support for Jade/OpenJade XSLT processors. Support is not functional nor is it clear it ever worked at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31535 b3059339-0415-0410-9bf9-f77b7e298cf2 Drop support for the Saxon XSLT processor. The XSLT processor detection needs to be overhauled and simplified. Since nobody appears to be using Saxon it is just a burden that hinders the simplification. It can be added back cleanly if there is popular request. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31536 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/xml: Get rid of xmllint wrapper redirectiondiego2010-11-022-14/+7
| | | | | | Run commands directly from make. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31534 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zc_CH: sync with en/mplayer.1 rev. 31372jrash2010-11-021-12/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31461 b3059339-0415-0410-9bf9-f77b7e298cf2
* build: Rename configure.log file to config.logdiego2010-11-0229-48/+48
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31415 b3059339-0415-0410-9bf9-f77b7e298cf2
* DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31364jrash2010-11-021-35/+106
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31369 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_rgb2bgr: remove the filtersiretart2010-11-022-11/+1
| | | | | | | | | | Its functionality has been superseeded by sws by quite some time, and the "swap" functionality is now provided by vf_format. see http://comments.gmane.org/gmane.comp.video.mplayer.devel/55804 for a full discussion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31350 b3059339-0415-0410-9bf9-f77b7e298cf2
* rtsp: Support RTSP/RTP over HTTP via LIVE555cehoyos2010-11-021-0/+5
| | | | | | | | | | 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 r31332Uoti Urpala2010-06-051-1/+12
|\
| * Extend -vf format to allow substituting the format for a compatible onereimar2010-06-051-1/+12
| | | | | | | | | | | | | | (e.g. chaning rgb24 to bgr24). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31331 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes r31318 to r31328Uoti Urpala2010-06-052-10/+9
|\| | | | | | | | | r31328 is a somewhat questionable (changing the option at that point isn't quite safe), but it was a failure case already...
| * sync with en/mplayer.1 rev. 31292jrash