summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-04-19 22:05:17 +0200
committerwm4 <wm4@nowhere>2014-04-19 22:05:17 +0200
commitb85983a4a6f52c85651f916bfedb8234c9424634 (patch)
tree8d25ec8de84ad597e12c1e7596253739ea951cc8 /DOCS
parent85998f6121edb44672f51c4745fb243f3c567d3f (diff)
downloadmpv-b85983a4a6f52c85651f916bfedb8234c9424634.tar.bz2
mpv-b85983a4a6f52c85651f916bfedb8234c9424634.tar.xz
encode: don't apply default config options
Often, user configs set options that are not suitable for encoding. Usually, playback and encoding are pretty different things, so it makes sense to keep them strictly separate. There are several possible solutions. The approach taken by this commit is to basically ignore the default config settings, and switch to an [encoding] config profile section instead. This also makes it impossible to have --o in a config file, because --o enables encode mode. See github issue #727 for discussion.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/encoding.rst5
-rw-r--r--DOCS/man/en/encode.rst2
2 files changed, 6 insertions, 1 deletions
diff --git a/DOCS/encoding.rst b/DOCS/encoding.rst
index 46d6c8ae34..c82416dfa6 100644
--- a/DOCS/encoding.rst
+++ b/DOCS/encoding.rst
@@ -38,6 +38,11 @@ section::
oac = aac
oacopts-add = b=96k
+It's also possible to define default encoding options by putting them into
+the section named ``[encoding]``. (This behavior changed after mpv 0.3.x. In
+mpv 0.3.x, config options in the default section / no section were applied
+to encoding. This is not the case anymore.)
+
One can then encode using this profile using the command::
mpv infile -o outfile.mp4 -profile myencprofile
diff --git a/DOCS/man/en/encode.rst b/DOCS/man/en/encode.rst
index b0d5ca3808..f23467d823 100644
--- a/DOCS/man/en/encode.rst
+++ b/DOCS/man/en/encode.rst
@@ -3,7 +3,7 @@ ENCODING
You can encode files from one format/codec to another using this facility.
-``-o <filename>``
+``--o=<filename>``
Enables encoding mode and specifies the output file name.
``--of=<format>``