diff options
| author |  wm4 <wm4@nowhere> | 2017-07-06 17:58:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-07-06 18:08:04 +0200 |
| commit | 6a59d7342fcce9102da8138e2356cd1f65a9b297 (patch) | |
| tree | 9865d3c13de2aff1bc8f04231951a8d2c5475327 /DOCS | |
| parent | fa857ac7bcac67753eb95191f20e2e4af6c314d0 (diff) | |
demux_lavf: remove --demuxer-lavf-cryptokey option
Was at least somewhat broken, and is misleading. I don't really have an
idea why FFmpeg has two AVOptions here anyway. We don't need to care,
and I'm only aware of 1 user trying this option ever.
See #4579.
Diffstat (limited to 'DOCS')
| -rw-r--r-- | DOCS/interface-changes.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/options.rst | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 61fa1f5779..1b4cfdf4c1 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -52,6 +52,8 @@ Interface changes replacement - deprecate passing multiple arguments to -add/-pre options (affects the vf/af commands too) + - remove --demuxer-lavf-cryptokey. Use --demux-lavf-o=cryptokey=<hex> or + --demux-lavf-o=decryption_key=<hex> instead (whatever fits your situation). --- mpv 0.25.0 --- - remove opengl-cb dxva2 dummy hwdec interop (see git "vo_opengl: remove dxva2 dummy hwdec backend") diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 2e48c51ffa..8baf9708db 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -2687,10 +2687,6 @@ Demuxer libavformat might reallocate the buffer internally, or not fully use all of it. -``--demuxer-lavf-cryptokey=<hexstring>`` - Encryption key the demuxer should use. This is the raw binary data of - the key converted to a hexadecimal string. - ``--demuxer-mkv-subtitle-preroll=<yes|index|no>``, ``--mkv-subtitle-preroll`` Try harder to show embedded soft subtitles when seeking somewhere. Normally, it can happen that the subtitle at the seek target is not shown due to how |