diff options
| -rw-r--r-- | DOCS/ChangeLog | 16 | ||||
| -rw-r--r-- | DOCS/example.conf | 7 | ||||
| -rw-r--r-- | DOCS/mplayer.1 | 4 |
3 files changed, 17 insertions, 10 deletions
diff --git a/DOCS/ChangeLog b/DOCS/ChangeLog index 54f244d0ce..cedc5c74a9 100644 --- a/DOCS/ChangeLog +++ b/DOCS/ChangeLog @@ -4,19 +4,15 @@ ChangeLog: v0.12-pre1: [ not yet released ] - ffmpeg included into source tree -=========================================================================== -Note: If you've sent patches not applied in pre22, please send them again! -/|\ (I've got tons of mails last weeks, and can't re-read all of them) -/~\ Please include in the Subject: MPLAYER-PATCH -=========================================================================== +*** 0.11 release is coming soon *** -*** 0.11 release is coming SOON!!! *** - -v0.11-pre26-CVS: +v0.11-CVS: + - added config file parser + - new timing code (in mplayerHQ) + - Spanish translation of DOCS - updated libmpeg2 source to libmpeg2-0.2.0 version - updated OpenDivX encore/decore to 4.0 alpha48 - -v0.11-pre25: yeah, we moved to SourceForge CVS! + - added fsdga driver : fullscreen scaling+dga driver - DOCS updated (email address changed from arpi@* -> maillist) - LIRC fix, mplayer_lirc changed back to mplayer [Andreas Ackermann] - stream.c: unsigned int fixes, required for some strange .asf files diff --git a/DOCS/example.conf b/DOCS/example.conf index f51427d497..023733840a 100644 --- a/DOCS/example.conf +++ b/DOCS/example.conf @@ -38,3 +38,10 @@ nosound = nein ## alsa = nem + +## +## You can also include another configfiles +## Specify full path! +## + +include = /home/gabucino/.mplayer/savage4.conf diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index 78f8846fa2..c7a9164208 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -26,6 +26,7 @@ mplayer \- Movie Player for Linux .RB [ \-xy\ factor ] .RB [ \-dsp\ device ] .RB [ \-pp\ quality ] +.RB [ \-include\ configfile ] .I file .PP .SH DESCRIPTION @@ -149,6 +150,9 @@ maximum sync correction per 5 frames (in seconds) .TP .B \-ni force usage of non-interleaved AVI parser +.TP +.B \-include +specify config file to be parsed after the default .IP .SH "ALPHA/BETA CODE" .TP |