diff options
author | wm4 <wm4@nowhere> | 2014-10-14 18:50:18 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-10-14 18:50:18 +0200 |
commit | aa141435784a4967bcadfe1a2f87fa3460d61d6e (patch) | |
tree | 7034281388ab500e974233e1579adf7b29303f7d | |
parent | bf382270f2da6310ce24f1efe107f57377811c19 (diff) | |
download | mpv-aa141435784a4967bcadfe1a2f87fa3460d61d6e.tar.bz2 mpv-aa141435784a4967bcadfe1a2f87fa3460d61d6e.tar.xz |
stream_lavf: expose concat://
Apparently there's an use for this; see #1178.
I won't redocument obscure FFmpeg features, so add a hint to the
manpage that some protocols are documented in FFmpeg instead.
-rw-r--r-- | DOCS/man/mpv.rst | 4 | ||||
-rw-r--r-- | stream/stream_lavf.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst index f4069fedce..a005b92349 100644 --- a/DOCS/man/mpv.rst +++ b/DOCS/man/mpv.rst @@ -467,6 +467,10 @@ PROTOCOLS be specified. mpv will never attempt to guess whether a filename is actually a network address. A protocol prefix is always required. + Note that not all prefixes are documented here. Undocumented prefixes are + either aliases to documented protocols, or are just reidrections to + protocols implemented and documented in FFmpeg. + ``-`` Play data from stdin. diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index 3d1c6e0062..2441492229 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -339,6 +339,7 @@ const stream_info_t stream_info_ffmpeg_unsafe = { .open = open_f, .protocols = (const char *const[]){ "lavf", "ffmpeg", "udp", "ftp", "tcp", "tls", "unix", "sftp", "md5", + "concat", NULL }, .can_write = true, }; |