April 2010 - MPlayer-DOCS - lists.mplayerhq.hu

r30822 - in trunk: DOCS/man/en/mplayer.1 libvo/geometry.c
by reimar 30 Sep '10

30 Sep '10

Author: reimar Date: Wed Mar 3 21:57:56 2010 New Revision: 30822 Log: Add support for specifying window position relative to right and bottom screen borders with -geometry. Based on patch by Melchior FRANZ [melchior franz gmail com]. Modified: trunk/DOCS/man/en/mplayer.1 Changes in other areas also in this revision: Modified: trunk/libvo/geometry.c Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Wed Mar 3 21:36:35 2010 (r30821) +++ trunk/DOCS/man/en/mplayer.1 Wed Mar 3 21:57:56 2010 (r30822) @@ -3143,13 +3143,16 @@ Fixes fullscreen switching on OpenBox 1. .PD 1 . .TP -.B \-geometry x[%][:y[%]] or [WxH][+x+y] +.B \-geometry x[%][:y[%]] or [WxH][+-x+-y] Adjust where the output is on the screen initially. The x and y specifications are in pixels measured from the top-left of the screen to the top-left of the image being displayed, however if a percentage sign is given after the argument it turns the value into a percentage of the screen size in that direction. -It also supports the standard X11 \-geometry option format. +It also supports the standard X11 \-geometry option format, in which e.g. ++10-50 means "place 10 pixels from the left border and 50 pixels from the lower +border" and "--20+-10" means "place 20 pixels beyond the right and 10 pixels +beyond the top border". If an external window is specified using the \-wid option, then the x and y coordinates are relative to the top-left corner of the window rather than the screen.

3 2

r31099 - trunk/DOCS/xml/en/mencoder.xml
by Gabrov 27 Apr '10

27 Apr '10

Author: Gabrov Date: Tue Apr 27 15:33:29 2010 New Revision: 31099 Log: fix typo Modified: trunk/DOCS/xml/en/mencoder.xml Modified: trunk/DOCS/xml/en/mencoder.xml ============================================================================== --- trunk/DOCS/xml/en/mencoder.xml Tue Apr 27 10:19:42 2010 (r31098) +++ trunk/DOCS/xml/en/mencoder.xml Tue Apr 27 15:33:29 2010 (r31099) @@ -615,7 +615,7 @@ mencoder mf://<replaceable>@list.txt</re </informalexample> You can mix different types of images, regardless of the method you use -t — individual filenames, wildcard or file with list — provided of +— individual filenames, wildcard or file with list — provided of course they have the same dimensions. So you can e.g. take title frame from PNG file, and then put a slideshow of your JPEG photos.

1 0

r30982 - in trunk/DOCS/xml: cs/mencoder.xml de/mencoder.xml en/mencoder.xml fr/mencoder.xml hu/mencoder.xml it/mencoder.xml pl/mencoder.xml ru/mencoder.xml zh_CN/mencoder.xml
by ptt 27 Apr '10

27 Apr '10

Author: ptt Date: Thu Apr 1 19:37:51 2010 New Revision: 30982 Log: updated example line for encoding to psp (acodec faac is now libfaac) Modified: trunk/DOCS/xml/en/mencoder.xml Changes in other areas also in this revision: Modified: trunk/DOCS/xml/cs/mencoder.xml trunk/DOCS/xml/de/mencoder.xml trunk/DOCS/xml/fr/mencoder.xml trunk/DOCS/xml/hu/mencoder.xml trunk/DOCS/xml/it/mencoder.xml trunk/DOCS/xml/pl/mencoder.xml trunk/DOCS/xml/ru/mencoder.xml trunk/DOCS/xml/zh_CN/mencoder.xml Modified: trunk/DOCS/xml/en/mencoder.xml ============================================================================== --- trunk/DOCS/xml/en/mencoder.xml Thu Apr 1 19:37:13 2010 (r30981) +++ trunk/DOCS/xml/en/mencoder.xml Thu Apr 1 19:37:51 2010 (r30982) @@ -401,9 +401,9 @@ You should be safe if you respect the fo <title>encode for PSP</title> <para> <screen> -mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -of lavf \ - -oac lavc -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=aac \ - -lavfopts format=psp \ +mencoder -ofps 30000/1001 -af lavcresample=24000 -vf harddup -oac lavc \ + -ovc lavc -lavcopts aglobal=1:vglobal=1:vcodec=mpeg4:acodec=libfaac \ + -of lavf -lavfopts format=psp \ <replaceable>input.video</replaceable> -o <replaceable>output.psp</replaceable> </screen> Note that you can set the title of the video with @@ -615,7 +615,7 @@ mencoder mf://<replaceable>@list.txt</re </informalexample> You can mix different types of images, regardless of the method you use -— individual filenames, wildcard or file with list — provided of +t — individual filenames, wildcard or file with list — provided of course they have the same dimensions. So you can e.g. take title frame from PNG file, and then put a slideshow of your JPEG photos.

3 2

r31096 - trunk/DOCS/man/en/mplayer.1
by Gabrov 25 Apr '10

25 Apr '10

Author: Gabrov Date: Sun Apr 25 21:58:43 2010 New Revision: 31096 Log: typo fixes Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Sun Apr 25 18:48:48 2010 (r31095) +++ trunk/DOCS/man/en/mplayer.1 Sun Apr 25 21:58:43 2010 (r31096) @@ -7521,7 +7521,7 @@ Specify an initial value for the PTS. Uses the .IR n th incoming PTS as the initial PTS. -All previous pts are kept, so setting a huge value or \-1 keeps the PTS +All previous PTS are kept, so setting a huge value or \-1 keeps the PTS intact. .IPs autofps=<n> Uses the @@ -10692,17 +10692,17 @@ slower and less effective at compression . .TP .B slice_max_size=<0 or positive integer> -Maximum slice size in bytes (default:0). +Maximum slice size in bytes (default: 0). A value of zero disables the maximum. . .TP .B slice_max_mbs=<0 or positive integer> -Maximum slice size in number of macroblocks (default:0). +Maximum slice size in number of macroblocks (default: 0). A value of zero disables the maximum. . .TP .B slices=<0 or positive integer> -Maximum number of slices per frame (default:0). +Maximum number of slices per frame (default: 0). A value of zero disables the maximum. . .TP

1 0

broken url to the English Html Manual
by Mger Zero 24 Apr '10

24 Apr '10

Can anyone access the MPlayer Manual Page at the address below? http://www.mplayerhq.hu/DOCS/man/en/mplayer.1.html I can access the text version of the Manual, but it's not as readable. http://www.mplayerhq.hu/DOCS/man/en/mplayer.1.txt The parent website address: http://www.mplayerhq.hu/design7/info.html#docs The broken url to the English Html Manual is found under the text heading "The manual page for MPlayer and MEncoder describes all available command line options and how to control MPlayer with the keyboard. " Thanks.

1 0

[homepage]: r3500 - trunk/src/media.en
by diego 22 Apr '10

22 Apr '10

Author: diego Date: Thu Apr 22 17:27:09 2010 New Revision: 3500 Log: Add "Conquer Video on Linux with MPlayer" article from linux.com. Modified: trunk/src/media.en Modified: trunk/src/media.en ============================================================================== --- trunk/src/media.en Mon Apr 12 13:37:03 2010 (r3499) +++ trunk/src/media.en Thu Apr 22 17:27:09 2010 (r3500) @@ -18,6 +18,13 @@ </tr> <tr> + <td>2010/03</td> + <td>English</td> + <td><a href="http://www.linux.com/">Linux.com</a></td> + <td><a href="http://www.linux.com/news/software/applications/292309-conqueror-video-on-l…">Conquer Video on Linux with MPlayer</a></td> +</tr> + +<tr> <td>2008/05</td> <td>English</td> <td><a href="http://www.sourcetrunk.com/">Sourcetrunk</a></td>

1 0

r31032 - in trunk: DOCS/default.css DOCS/man/fr/mplayer.1 DOCS/tech/codec-devel.txt DOCS/tech/colorspaces.txt DOCS/tech/general.txt DOCS/tech/hwac3.txt DOCS/tech/libvo.txt DOCS/tech/mirrors/mirror_...
by diego 12 Apr '10

12 Apr '10

Author: diego Date: Mon Apr 12 12:56:17 2010 New Revision: 31032 Log: the great MPlayer tab removal: part I Modified: trunk/DOCS/xml/README trunk/DOCS/xml/README.maintainers trunk/DOCS/xml/configure trunk/DOCS/xml/default.css trunk/DOCS/xml/en/ports.xml trunk/DOCS/xml/en/skin.xml trunk/DOCS/xml/en/video.xml trunk/DOCS/xml/ldp.dsl trunk/help/help_mp-en.h Changes in other areas also in this revision: Modified: trunk/DOCS/default.css trunk/DOCS/man/fr/mplayer.1 trunk/DOCS/tech/codec-devel.txt trunk/DOCS/tech/colorspaces.txt trunk/DOCS/tech/general.txt trunk/DOCS/tech/hwac3.txt trunk/DOCS/tech/libvo.txt trunk/DOCS/tech/mirrors/mirror_howto.txt trunk/DOCS/tech/mpdsf.txt trunk/DOCS/tech/mpsub.sub trunk/DOCS/tech/osd.txt trunk/DOCS/tech/realcodecs/audio-codecs.txt trunk/DOCS/tech/realcodecs/streaming.txt trunk/DOCS/tech/realcodecs/video-codecs.txt trunk/DOCS/tech/subcp.txt trunk/DOCS/tech/swscaler_filters.txt trunk/DOCS/tech/swscaler_methods.txt trunk/DOCS/tech/vidix.txt trunk/DOCS/xml/cs/video.xml trunk/DOCS/xml/de/cd-dvd.xml trunk/DOCS/xml/de/encoding-guide.xml trunk/DOCS/xml/de/faq.xml trunk/DOCS/xml/de/tvinput.xml trunk/DOCS/xml/de/usage.xml trunk/DOCS/xml/de/video.xml trunk/DOCS/xml/es/video.xml trunk/DOCS/xml/fr/encoding-guide.xml trunk/DOCS/xml/fr/install.xml trunk/DOCS/xml/fr/mencoder.xml trunk/DOCS/xml/fr/ports.xml trunk/DOCS/xml/fr/usage.xml trunk/DOCS/xml/fr/video.xml trunk/DOCS/xml/hu/encoding-guide.xml trunk/DOCS/xml/hu/mencoder.xml trunk/DOCS/xml/hu/video.xml trunk/DOCS/xml/it/usage.xml trunk/DOCS/xml/it/video.xml trunk/DOCS/xml/pl/bugreports.xml trunk/DOCS/xml/pl/faq.xml trunk/DOCS/xml/pl/ports.xml trunk/DOCS/xml/pl/skin.xml trunk/DOCS/xml/ru/usage.xml trunk/DOCS/xml/xsl/ldp-html-common.xsl trunk/drivers/3dfx.h trunk/drivers/README.Ati trunk/drivers/README.Matrox trunk/drivers/generic_math.h trunk/drivers/hacking.ati trunk/drivers/mga_vid.c trunk/drivers/mga_vid_test.c trunk/drivers/radeon.h trunk/help/help_create.sh trunk/help/help_mp-bg.h trunk/help/help_mp-cs.h trunk/help/help_mp-dk.h trunk/help/help_mp-el.h trunk/help/help_mp-es.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-ja.h trunk/help/help_mp-ko.h trunk/help/help_mp-mk.h trunk/help/help_mp-nb.h trunk/help/help_mp-nl.h trunk/help/help_mp-pl.h trunk/help/help_mp-pt_BR.h trunk/help/help_mp-ro.h trunk/help/help_mp-ru.h trunk/help/help_mp-sk.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h trunk/mp3lib/dct36.c trunk/mp3lib/dct36_3dnow.c trunk/mp3lib/dct64_3dnow.c trunk/mp3lib/dct64_k7.c trunk/mp3lib/dct64_mmx.c trunk/mp3lib/decod386.c trunk/mp3lib/decode_i586.c trunk/mp3lib/decode_mmx.c trunk/mp3lib/equalizer.c trunk/mp3lib/l2tables.h trunk/mp3lib/layer1.c trunk/mp3lib/layer2.c trunk/mp3lib/layer3.c trunk/mp3lib/mpg123.h trunk/mp3lib/sr1.c Modified: trunk/DOCS/xml/README ============================================================================== --- trunk/DOCS/xml/README Mon Apr 12 10:03:39 2010 (r31031) +++ trunk/DOCS/xml/README Mon Apr 12 12:56:17 2010 (r31032) @@ -39,13 +39,13 @@ Installing the required tools from sourc 2) Download the docbook-xml package from http://www.oasis-open.org/docbook/xml/ Use the newest version. The URL will be something like this: - http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip + http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip Extract this package into a directory, enter it, and execute the following commands: - mkdir -p /usr/share/sgml/docbook/dtd/xml/4.2/ - cp -r * /usr/share/sgml/docbook/dtd/xml/4.2/ + mkdir -p /usr/share/sgml/docbook/dtd/xml/4.2/ + cp -r * /usr/share/sgml/docbook/dtd/xml/4.2/ 3) Download the docbook-xsl package from @@ -53,14 +53,13 @@ Installing the required tools from sourc Use the newest version. The URL will be something like this: - http://prdownloads.sourceforge.net/docbook/docbook-xsl-1.62.0.tar.gz + http://prdownloads.sourceforge.net/docbook/docbook-xsl-1.62.0.tar.gz Extract this package into a directory, enter it, and execute the following commands: - mkdir -p /usr/share/sgml/docbook/stylesheet/xsl/nwalsh - cp -r VERSION common html lib \ - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh + mkdir -p /usr/share/sgml/docbook/stylesheet/xsl/nwalsh + cp -r VERSION common html lib /usr/share/sgml/docbook/stylesheet/xsl/nwalsh Building the documentation @@ -68,7 +67,7 @@ Building the documentation Before trying to build the documentation, run - make help + make help to see all available build targets and make your choice. If something goes wrong, check the Configuration section of the toplevel Makefile and adjust @@ -82,15 +81,15 @@ As far as I know, the document type decl both a public and a system identifier. For example: <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd"> + "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd"> where - "-//OASIS//DTD DocBook XML V4.1.2//EN" + "-//OASIS//DTD DocBook XML V4.1.2//EN" is the public, and - "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd" + "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd" is the system identifier. Modified: trunk/DOCS/xml/README.maintainers ============================================================================== --- trunk/DOCS/xml/README.maintainers Mon Apr 12 10:03:39 2010 (r31031) +++ trunk/DOCS/xml/README.maintainers Mon Apr 12 12:56:17 2010 (r31032) @@ -5,9 +5,9 @@ in each of those directories to create t in subdirectories of the 'HTML' directory. IMPORTANT: Do NOT place sensitive files under 'HTML'! - It is for generated documentation only. - The whole directory tree is wiped out by the Makefile - when running 'make distclean' or 'make clean'. + It is for generated documentation only. + The whole directory tree is wiped out by the Makefile + when running 'make distclean' or 'make clean'. Each subdirectory must have a Makefile. Its purpose is to include the toplevel Makefile.inc file (with the rules to build the docs) Modified: trunk/DOCS/xml/configure ============================================================================== --- trunk/DOCS/xml/configure Mon Apr 12 10:03:39 2010 (r31031) +++ trunk/DOCS/xml/configure Mon Apr 12 12:56:17 2010 (r31032) @@ -164,7 +164,7 @@ for lang in `grep 'DOC_LANGS =' ../../co EOF for file in `find $lang en -name \*.xml -exec basename \{\} \; | sort -u`; do - echo '<!ENTITY '$file' SYSTEM "'$file'">' >> $lang/main.xml + echo '<!ENTITY '$file' SYSTEM "'$file'">' >> $lang/main.xml done cat >> $lang/main.xml << EOF @@ -237,7 +237,7 @@ then if test -z "$_fake_chunk_xsl" then # _xsltcommand="cd \$1 && if test \"\`dirname \$2 | head -c 1\`\" = \".\" ; then $_java -classpath $_saxon_jar com.icl.saxon.StyleSheet \$_IN_DIR/\$3 \$_IN_DIR/\$2 ; else $_java -classpath $_saxon_jar com.icl.saxon.StyleSheet \$_IN_DIR/\$3 \$2 ;fi" - _xsltcommand=" + _xsltcommand=" if test \"\`dirname \$2 | head -c 1\`\" = \".\" then _STYLESHEET=\$_IN_DIR/\$2 @@ -306,9 +306,9 @@ then done if test "x$_docbook_dsl" = "x" -o "x$_xml_dcl" = "x" then - echo "One of the files docbook.dsl and xml.dcl or both of them weren't found." - echo "Bailing out." - exit 1 + echo "One of the files docbook.dsl and xml.dcl or both of them weren't found." + echo "Bailing out." + exit 1 fi _xsltcommand="cd \$1 && $_jade -t xml -d $_docbook_dsl $_xml_dcl \$_IN_DIR/\$3" else Modified: trunk/DOCS/xml/default.css ============================================================================== --- trunk/DOCS/xml/default.css Mon Apr 12 10:03:39 2010 (r31031) +++ trunk/DOCS/xml/default.css Mon Apr 12 12:56:17 2010 (r31032) @@ -1,44 +1,44 @@ body { - color: black; - background: white; + color: black; + background: white; - font-family: Arial, Helvetica, sans-serif; + font-family: Arial, Helvetica, sans-serif; /* * It's a Bad Idea(tm) to use fixed font sizes. * Uncomment it if you _really_ want */ - font-size: 14px; + font-size: 14px; } div.table table, div.informaltable table { - background: #333366; - border-collapse: separate; - border: solid 1px #333366; - border-spacing: 1px; + background: #333366; + border-collapse: separate; + border: solid 1px #333366; + border-spacing: 1px; } div.table th, div.informaltable th { - color: white; - background: #4488cc; - border: 0px; - padding: 2px; + color: white; + background: #4488cc; + border: 0px; + padding: 2px; } div.table td, div.informaltable td { - background: #fffff8; - border: 0px; - padding: 2px; + background: #fffff8; + border: 0px; + padding: 2px; } pre.screen { - padding: 4px; - background: #e0e0e0; + padding: 4px; + background: #e0e0e0; } pre.programlisting { - padding: 4px; - background: #e0e8f0; + padding: 4px; + background: #e0e8f0; } /* @@ -47,37 +47,37 @@ span.application { */ span.keycap { - background: #ddd; - border: solid 1px #aaa; - white-space: nowrap; - font-family: Arial, Helvetica, sans-serif; + background: #ddd; + border: solid 1px #aaa; + white-space: nowrap; + font-family: Arial, Helvetica, sans-serif; } span.guimenu, span.guisubmenu, span.guimenuitem { - background: #dddddd; + background: #dddddd; } tt.filename { - color: maroon; - white-space: nowrap; + color: maroon; + white-space: nowrap; } tt.option { - color: #066; - white-space: nowrap; + color: #066; + white-space: nowrap; } div.example { - padding-left: 0.5em; - border-left: solid 2px black; + padding-left: 0.5em; + border-left: solid 2px black; } div.important .title, div.caution .title, div.warning .title { - color: #c00; + color: #c00; } /* div.important, div.warning, div.caution { - padding-left: 0.5em; - border-left: solid 2px maroon; + padding-left: 0.5em; + border-left: solid 2px maroon; } */ Modified: trunk/DOCS/xml/en/ports.xml ============================================================================== --- trunk/DOCS/xml/en/ports.xml Mon Apr 12 10:03:39 2010 (r31031) +++ trunk/DOCS/xml/en/ports.xml Mon Apr 12 12:56:17 2010 (r31032) @@ -253,7 +253,7 @@ use GNU as: % gmake ... gcc -c -Iloader -Ilibvo -O4 -march=i686 -mcpu=i686 -pipe -ffast-math - -fomit-frame-pointer -I/usr/local/include -o mplayer.o mplayer.c + -fomit-frame-pointer -I/usr/local/include -o mplayer.o mplayer.c Assembler: mplayer.c "(stdin)", line 3567 : Illegal mnemonic "(stdin)", line 3567 : Syntax error Modified: trunk/DOCS/xml/en/skin.xml ============================================================================== --- trunk/DOCS/xml/en/skin.xml Mon Apr 12 10:03:39 2010 (r31031) +++ trunk/DOCS/xml/en/skin.xml Mon Apr 12 12:56:17 2010 (r31032) @@ -496,7 +496,7 @@ blocks. <informaltable> <tgroup cols="2"> <thead> - <row><entry>Variable</entry><entry>Meaning</entry></row> + <row><entry>Variable</entry><entry>Meaning</entry></row> </thead> <tbody> <row> @@ -504,84 +504,84 @@ blocks. <entry>play time in <emphasis>hh:mm:ss</emphasis> format</entry> </row> <row> - <entry>$2</entry> - <entry>play time in <emphasis>mmmm:ss</emphasis> format</entry> + <entry>$2</entry> + <entry>play time in <emphasis>mmmm:ss</emphasis> format</entry> </row> <row> - <entry>$3</entry> - <entry>play time in <emphasis>hh</emphasis> format (hours)</entry> + <entry>$3</entry> + <entry>play time in <emphasis>hh</emphasis> format (hours)</entry> </row> <row> - <entry>$4</entry> - <entry>play time in <emphasis>mm</emphasis> format (minutes)</entry> + <entry>$4</entry> + <entry>play time in <emphasis>mm</emphasis> format (minutes)</entry> </row> <row> - <entry>$5</entry> - <entry>play time in <emphasis>ss</emphasis> format (seconds)</entry> + <entry>$5</entry> + <entry>play time in <emphasis>ss</emphasis> format (seconds)</entry> </row> <row> - <entry>$6</entry> - <entry>movie length in <emphasis>hh:mm:ss</emphasis> format</entry> + <entry>$6</entry> + <entry>movie length in <emphasis>hh:mm:ss</emphasis> format</entry> </row> <row> - <entry>$7</entry> - <entry>movie length in <emphasis>mmmm:ss</emphasis> format</entry> + <entry>$7</entry> + <entry>movie length in <emphasis>mmmm:ss</emphasis> format</entry> </row> <row> - <entry>$8</entry> - <entry>play time in <emphasis>h:mm:ss</emphasis> format</entry> + <entry>$8</entry> + <entry>play time in <emphasis>h:mm:ss</emphasis> format</entry> </row> <row> - <entry>$v</entry> - <entry>volume in <emphasis>xxx.xx</emphasis>% format</entry> + <entry>$v</entry> + <entry>volume in <emphasis>xxx.xx</emphasis>% format</entry> </row> <row> - <entry>$V</entry> - <entry>volume in <emphasis>xxx.xx</emphasis> format</entry> + <entry>$V</entry> + <entry>volume in <emphasis>xxx.xx</emphasis> format</entry> </row> <row> - <entry>$b</entry> - <entry>balance in <emphasis>xxx.xx</emphasis>% format</entry> + <entry>$b</entry> + <entry>balance in <emphasis>xxx.xx</emphasis>% format</entry> </row> <row> - <entry>$B</entry> - <entry>balance in <emphasis>xxx.xx</emphasis> format</entry> + <entry>$B</entry> + <entry>balance in <emphasis>xxx.xx</emphasis> format</entry> </row> <row> - <entry>$$</entry> - <entry>the $ character</entry> + <entry>$$</entry> + <entry>the $ character</entry> </row> <row> - <entry>$a</entry> - <entry>a character according to the audio type (none: <literal>n</literal>, - mono: <literal>m</literal>, stereo: <literal>t</literal>)</entry> + <entry>$a</entry> + <entry>a character according to the audio type (none: <literal>n</literal>, + mono: <literal>m</literal>, stereo: <literal>t</literal>)</entry> </row> <row> - <entry>$t</entry> - <entry>track number (in playlist)</entry> + <entry>$t</entry> + <entry>track number (in playlist)</entry> </row> <row> - <entry>$o</entry> - <entry>filename</entry> + <entry>$o</entry> + <entry>filename</entry> </row> <row> - <entry>$f</entry> - <entry>filename in lower case</entry> + <entry>$f</entry> + <entry>filename in lower case</entry> </row> <row> - <entry>$F</entry> - <entry>filename in upper case</entry> + <entry>$F</entry> + <entry>filename in upper case</entry> </row> <row> - <entry>$T</entry> - <entry> - a character according to the stream type (file: <literal>f</literal>, - Video CD: <literal>v</literal>, DVD: <literal>d</literal>, - URL: <literal>u</literal>) - </entry> + <entry>$T</entry> + <entry> + a character according to the stream type (file: <literal>f</literal>, + Video CD: <literal>v</literal>, DVD: <literal>d</literal>, + URL: <literal>u</literal>) + </entry> </row> <row> - <entry>$p</entry> + <entry>$p</entry> <entry>the <keycap>p</keycap> character (if a movie is playing and the font has the <keycap>p</keycap> character)</entry> </row> Modified: trunk/DOCS/xml/en/video.xml ============================================================================== --- trunk/DOCS/xml/en/video.xml Mon Apr 12 10:03:39 2010 (r31031) +++ trunk/DOCS/xml/en/video.xml Mon Apr 12 12:56:17 2010 (r31032) @@ -2255,7 +2255,7 @@ issue the following command <screen> mplayer -vo zr -zrdev /dev/video0 -zrcrop 352x288+352+0 -zrxdoff 0 -zrbw \ -zrcrop 352x288+0+0 -zrdev /dev/video1 -zrquality 10 \ - <replaceable>movie.avi</replaceable> + <replaceable>movie.avi</replaceable> </screen> </para> Modified: trunk/DOCS/xml/ldp.dsl ============================================================================== --- trunk/DOCS/xml/ldp.dsl Mon Apr 12 10:03:39 2010 (r31031) +++ trunk/DOCS/xml/ldp.dsl Mon Apr 12 12:56:17 2010 (r31032) @@ -348,9 +348,9 @@ (define (shade-verbatim-attr-element element) (list (list "BORDER" - (cond - ((equal? element (normalize "SCREEN")) "1") - (else "0"))) + (cond + ((equal? element (normalize "SCREEN")) "1") + (else "0"))) (list "BGCOLOR" (car (cdr (shade-verbatim-element-colors element)))) (list "WIDTH" ($table-width$)))) Modified: trunk/help/help_mp-en.h ============================================================================== --- trunk/help/help_mp-en.h Mon Apr 12 10:03:39 2010 (r31031) +++ trunk/help/help_mp-en.h Mon Apr 12 12:56:17 2010 (r31032) @@ -1400,7 +1400,7 @@ static const char help_text[]= #define MSGTR_TooManyAudioInBuffer "\nToo many audio packets in the buffer: (%d in %d bytes).\n" #define MSGTR_TooManyVideoInBuffer "\nToo many video packets in the buffer: (%d in %d bytes).\n" #define MSGTR_MaybeNI "Maybe you are playing a non-interleaved stream/file or the codec failed?\n" \ - "For AVI files, try to force non-interleaved mode with the -ni option.\n" + "For AVI files, try to force non-interleaved mode with the -ni option.\n" #define MSGTR_WorkAroundBlockAlignHeaderBug "AVI: Working around CBR-MP3 nBlockAlign header bug!\n" #define MSGTR_SwitchToNi "\nBadly interleaved AVI file detected - switching to -ni mode...\n" #define MSGTR_InvalidAudioStreamNosound "AVI: invalid audio stream ID: %d - ignoring (nosound)\n" @@ -1411,7 +1411,7 @@ static const char help_text[]= #define MSGTR_NotSystemStream "Not MPEG System Stream format... (maybe Transport Stream?)\n" #define MSGTR_InvalidMPEGES "Invalid MPEG-ES stream??? Contact the author, it may be a bug :(\n" #define MSGTR_FormatNotRecognized "============ Sorry, this file format is not recognized/supported =============\n"\ - "=== If this file is an AVI, ASF or MPEG stream, please contact the author! ===\n" + "=== If this file is an AVI, ASF or MPEG stream, please contact the author! ===\n" #define MSGTR_SettingProcessPriority "Setting process priority: %s\n" #define MSGTR_FilefmtFourccSizeFpsFtime "[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.3f ftime:=%6.4f\n" #define MSGTR_CannotInitializeMuxer "Cannot initialize muxer."

2 1

[homepage]: r3499 - trunk/src/donations.en
by diego 12 Apr '10

12 Apr '10

Author: diego Date: Mon Apr 12 13:37:03 2010 New Revision: 3499 Log: I now have a new office chair. Modified: trunk/src/donations.en Modified: trunk/src/donations.en ============================================================================== --- trunk/src/donations.en Wed Apr 7 00:50:41 2010 (r3498) +++ trunk/src/donations.en Mon Apr 12 13:37:03 2010 (r3499) @@ -51,7 +51,6 @@ <ul> <li>large (160GB+) IDE notebook harddisk</li> -<li>good office chair</li> <li>region 3, 5, 6 DVDs</li> <li><a href="http://lwn.net/subscribe/GiftCertificates">LWN</a> subscription extension</li>

1 0

r31028 - in trunk: DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/man/fr/mplayer.1 DOCS/tech/slave.txt command.c etc/input.conf input/input.c input/input.h
by cehoyos 09 Apr '10

09 Apr '10

Author: cehoyos Date: Fri Apr 9 21:20:52 2010 New Revision: 31028 Log: Add osd_show_progression: Show progress bar and elapsed/total time. Patch by Hugo Chargois, hugo D chargois A free fr Modified: trunk/DOCS/man/en/mplayer.1 Changes in other areas also in this revision: Modified: trunk/DOCS/man/de/mplayer.1 trunk/DOCS/man/fr/mplayer.1 trunk/DOCS/tech/slave.txt trunk/command.c trunk/etc/input.conf trunk/input/input.c trunk/input/input.h Modified: trunk/DOCS/man/en/mplayer.1 ============================================================================== --- trunk/DOCS/man/en/mplayer.1 Wed Apr 7 21:36:23 2010 (r31027) +++ trunk/DOCS/man/en/mplayer.1 Fri Apr 9 21:20:52 2010 (r31028) @@ -286,6 +286,8 @@ Take a screenshot. Start/stop taking screenshots. .IPs "I\ \ \ \ " Show filename on the OSD. +.IPs "P\ \ \ \ " +Show progression bar, elapsed time and total duration on the OSD. .IPs "! and @" Seek to the beginning of the previous/next chapter. .IPs "D (\-vo xvmc, \-vo vdpau, \-vf yadif, \-vf kerndeint only)"

1 0

[homepage]: r3498 - trunk/src/donations.en
by diego 06 Apr '10

06 Apr '10

Author: diego Date: Wed Apr 7 00:50:41 2010 New Revision: 3498 Log: I received a power adapter for my PowerBook from Alexander Strange, thanks! Modified: trunk/src/donations.en Modified: trunk/src/donations.en ============================================================================== --- trunk/src/donations.en Thu Apr 1 10:48:42 2010 (r3497) +++ trunk/src/donations.en Wed Apr 7 00:50:41 2010 (r3498) @@ -50,7 +50,6 @@ <h3><a name="diego" href="mailto:diego_REMOVE_THE_UNDERSCORES_AND_THE_TEXT_IN_BETWEEN_@biurrun.de">Diego Biurrun</a></h3> <ul> -<li>power adapter for G4 PowerBook (model A1021 or A1036)</li> <li>large (160GB+) IDE notebook harddisk</li> <li>good office chair</li> <li>region 3, 5, 6 DVDs</li> @@ -192,6 +191,7 @@ <h3>Diego Biurrun</h3> <ul> +<li>power adapter for G4 PowerBook (Alexander Strange)</li> <li>PowerBook replacement battery (Kadir Yilanci)</li> <li>2GB USB stick (<a href="http://www.freebiesms.co.uk/" rel="nofollow">Fiach Reid / FreebieSMS</a>)</li> <li>Mac OS X 10.5 license (Diego Pettenò)</li>

1 0