diff options
| author | Rudolf Polzer <divverent@xonotic.org> | 2012-10-01 10:43:47 +0200 |
|---|---|---|
| committer | Rudolf Polzer <divverent@xonotic.org> | 2012-10-01 11:04:48 +0200 |
| commit | 683966241c7478dc93e6dd5a60f1acc86b5bfdbb (patch) | |
| tree | 8c3538373ede9fbf0de09ee5a078a8ece521a02d /DOCS/man | |
| parent | 22481e75c0ad7e1aad2cd943bdbc2374675172ee (diff) | |
| download | mpv-683966241c7478dc93e6dd5a60f1acc86b5bfdbb.tar.bz2 mpv-683966241c7478dc93e6dd5a60f1acc86b5bfdbb.tar.xz | |
encode: remove dependency on current ffmpeg
Apparently, libav doesn't have the change for the new way to create a
libavformat context merged yet. So, we can't use that...
Rather, this commit fixes format specific avoptions another way.
On the downside, invalid format options are now detected very late, and
any attempt to set an option value to +something or -something will
append to the previously set option value (this logic can no longer be
specific to options of bitflag type, as finding out the option type is
what we simply cannot do with this interface).
Diffstat (limited to 'DOCS/man')
| -rw-r--r-- | DOCS/man/en/encode.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/DOCS/man/en/encode.rst b/DOCS/man/en/encode.rst index 20b4d35487..93b1b84f28 100644 --- a/DOCS/man/en/encode.rst +++ b/DOCS/man/en/encode.rst @@ -10,8 +10,8 @@ You can encode files from one format/codec to another using this facility. --of=<format> Specifies the output format (overrides autodetection by the extension of - the file specified by -o). - See --of=help for a full list of supported formats. + the file specified by -o). This can be a comma separated list of possible + formats to try. See --of=help for a full list of supported formats. --ofopts=<options> Specifies the output format options for libavformat. |