diff options
| author | wm4 <wm4@nowhere> | 2018-04-22 19:40:36 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-04-29 02:21:32 +0300 |
| commit | 6c8362ef54f4e90476553cb6b64996cc414da06d (patch) | |
| tree | ab3fa75a18958bacc08c473304f59519a58f5969 /DOCS | |
| parent | 8135e25600ace2894df274e6a825cfef525fee77 (diff) | |
| download | mpv-6c8362ef54f4e90476553cb6b64996cc414da06d.tar.bz2 mpv-6c8362ef54f4e90476553cb6b64996cc414da06d.tar.xz | |
encode: rewrite half of it
The main change is that we wait with opening the muxer ("writing
headers") until we have data from all streams. This fixes race
conditions at init due to broken assumptions in the old code.
This also changes a lot of other stuff. I found and fixed a few API
violations (often things for which better mechanisms were invented, and
the old ones are not valid anymore). I try to get away from the public
mutex and shared fields in encode_lavc_context. For now it's still
needed for some timestamp-related fields, but most are gone. It also
removes some bad code duplication between audio and video paths.
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/man/encode.rst | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/DOCS/man/encode.rst b/DOCS/man/encode.rst index 0edf7e7215..9169f4781b 100644 --- a/DOCS/man/encode.rst +++ b/DOCS/man/encode.rst @@ -8,9 +8,8 @@ You can encode files from one format/codec to another using this facility. ``--of=<format>`` Specifies the output format (overrides autodetection by the file name - extension of 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. + extension of the file specified by ``-o``). See ``--of=help`` for a full + list of supported formats. ``--ofopts=<options>`` Specifies the output format options for libavformat. @@ -59,9 +58,8 @@ You can encode files from one format/codec to another using this facility. avoid ``--oautofps``. ``--oac=<codec>`` - Specifies the output audio codec. This can be a comma separated list of - possible codecs to try. See ``--oac=help`` for a full list of supported - codecs. + Specifies the output audio codec. See ``--oac=help`` for a full list of + supported codecs. ``--oaoffset=<value>`` Shifts audio data by the given time (in seconds) by adding/removing @@ -97,9 +95,8 @@ You can encode files from one format/codec to another using this facility. By default, the order is unspecified. Deprecated. ``--ovc=<codec>`` - Specifies the output video codec. This can be a comma separated list of - possible codecs to try. See ``--ovc=help`` for a full list of supported - codecs. + Specifies the output video codec. See ``--ovc=help`` for a full list of + supported codecs. ``--ovoffset=<value>`` Shifts video data by the given time (in seconds) by shifting the pts |