diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
| commit | 7795726e0f8c70edd6ecde7fd2137214af302f4f (patch) | |
| tree | 87a087e69a0e2912183736de409676f824fb2248 /DOCS/xml/en | |
| parent | ba3b65b92f3f822fa75b0210b841557f5b20f6d1 (diff) | |
| parent | e16f02fe4001f3056b8efd1a099a563569b73f5d (diff) | |
| download | mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.bz2 mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.xz | |
Merge svn changes up to r31033
Diffstat (limited to 'DOCS/xml/en')
| -rw-r--r-- | DOCS/xml/en/ports.xml | 2 | ||||
| -rw-r--r-- | DOCS/xml/en/video.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml index f90cec3332..73708da5c7 100644 --- a/DOCS/xml/en/ports.xml +++ b/DOCS/xml/en/ports.xml @@ -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 diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index 001aaff90b..249e0adcc9 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -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> |