diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 20:59:01 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 20:59:01 +0300 |
| commit | a817e69131dadfc3529697dad1978810b1831d04 (patch) | |
| tree | e6e9305b6070490c18b800f34c86facb30c21a0f /DOCS | |
| parent | fa47d009b4bc73a051f7a07a2399193549dc810e (diff) | |
| parent | 04d20b550dd1d00f18686ecd8ac95212aab8e109 (diff) | |
| download | mpv-a817e69131dadfc3529697dad1978810b1831d04.tar.bz2 mpv-a817e69131dadfc3529697dad1978810b1831d04.tar.xz | |
Merge svn changes up to r31100
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/xml/en/mencoder.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml index e866016740..a91c422740 100644 --- a/DOCS/xml/en/mencoder.xml +++ b/DOCS/xml/en/mencoder.xml @@ -615,7 +615,7 @@ mencoder mf://<replaceable>@list.txt</replaceable> -mf w=800:h=600:fps=25:type=j </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. |