summaryrefslogtreecommitdiffstats
path: root/DOCS/encoding.rst
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-04-29 02:55:27 +0200
committerJan Ekström <jeebjp@gmail.com>2018-05-03 01:08:44 +0300
commitf18c4175ad8e772c0005ac6280291af425c16cc2 (patch)
tree46aac8acb7cedd83de8958d86bbd69d179a6cc9f /DOCS/encoding.rst
parent60dade104033f04fdd64f400d3f6707cf16d0ed7 (diff)
downloadmpv-f18c4175ad8e772c0005ac6280291af425c16cc2.tar.bz2
mpv-f18c4175ad8e772c0005ac6280291af425c16cc2.tar.xz
encode: remove old timestamp handling
This effectively makes --ocopyts the default. The --ocopyts option itself is also removed, because it's redundant.
Diffstat (limited to 'DOCS/encoding.rst')
-rw-r--r--DOCS/encoding.rst13
1 files changed, 6 insertions, 7 deletions
diff --git a/DOCS/encoding.rst b/DOCS/encoding.rst
index 6f9cd1a390..15e38a4581 100644
--- a/DOCS/encoding.rst
+++ b/DOCS/encoding.rst
@@ -3,8 +3,7 @@ General usage
::
- mpv infile -o outfile [-of outfileformat] [-ofopts formatoptions] \
- [-ofps outfps | -oautofps] [-oharddup] [-ocopyts | -orawts] [-oneverdrop] \
+ mpv infile -o outfile [-of outfileformat] [-ofopts formatoptions] [-orawts] \
[(any other mpv options)] \
-ovc outvideocodec [-ovcopts outvideocodecoptions] \
-oac outaudiocodec [-oacopts outaudiocodecoptions]
@@ -60,13 +59,13 @@ for.
Typical MPEG-4 Part 2 ("ASP", "DivX") encoding, AVI container::
mpv infile -o outfile.avi \
- -ofps 25 \
+ --vf=fps=25 \
-ovc mpeg4 -ovcopts qscale=4 \
-oac libmp3lame -oacopts ab=128k
-Note: AVI does not support variable frame rate, so -ofps must be used. The
-frame rate should ideally match the input (25 for PAL, 24000/1001 or 30000/1001
-for NTSC)
+Note: AVI does not support variable frame rate, so the fps filter must be used.
+The frame rate should ideally match the input (25 for PAL, 24000/1001 or
+30000/1001 for NTSC)
Typical MPEG-4 Part 10 ("AVC", "H.264") encoding, Matroska (MKV) container::
@@ -129,7 +128,7 @@ What works
==========
* Encoding at variable frame rate (default)
-* Encoding at constant frame rate using -ofps framerate -oharddup
+* Encoding at constant frame rate using --vf=fps=RATE
* 2-pass encoding (specify flags=+pass1 in the first pass's -ovcopts, specify
flags=+pass2 in the second pass)
* Hardcoding subtitles using vobsub, ass or srt subtitle rendering (just