summaryrefslogtreecommitdiffstats
path: root/DOCS/xml/en
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 17:54:52 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 17:55:05 +0300
commite913d6c5dabcf342d8c1a7070382d712fc354948 (patch)
tree965b5b698c7075e53123593eb4b5bfdb45d78c56 /DOCS/xml/en
parentbe935e27666d8fdbf387adb1fcc30d243f6359dc (diff)
parent00959d5cf76d4ad94de9d0022b7b40a58acf2b95 (diff)
downloadmpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.bz2
mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.xz
Merge svn changes up to r31004
Diffstat (limited to 'DOCS/xml/en')
-rw-r--r--DOCS/xml/en/mencoder.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index 8914d229d1..e866016740 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -401,9 +401,9 @@ You should be safe if you respect the following constraints:
<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</replaceable> -mf w=800:h=600:fps=25:type=j
</informalexample>
You can mix different types of images, regardless of the method you use
-&mdash; individual filenames, wildcard or file with list &mdash; provided of
+t &mdash; individual filenames, wildcard or file with list &mdash; 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.