diff options
author | wm4 <wm4@nowhere> | 2013-07-07 20:55:14 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-07 21:10:44 +0200 |
commit | 4caa3356b298116a03ac0509b80dd60eca4017cc (patch) | |
tree | 7e3ba011e2695888eb4caaaf9534f4d7eb65bd4e /DOCS | |
parent | c4f83ac6e93ec9ff2fe97b3f5c6fccc9751fa3e2 (diff) | |
download | mpv-4caa3356b298116a03ac0509b80dd60eca4017cc.tar.bz2 mpv-4caa3356b298116a03ac0509b80dd60eca4017cc.tar.xz |
Remove some leftovers from network removal
stream_vstream.c in particular was actually dependent on the network
code, and didn't compile anymore.
Cleanup the protocol list in mpv.rst, and add some missing ones
supported by libavformat to stream_lavf.c.
Diffstat (limited to 'DOCS')
-rw-r--r-- | DOCS/man/en/mpv.rst | 4 | ||||
-rw-r--r-- | DOCS/man/en/options.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/DOCS/man/en/mpv.rst b/DOCS/man/en/mpv.rst index c38e4398b1..bf0d40ba98 100644 --- a/DOCS/man/en/mpv.rst +++ b/DOCS/man/en/mpv.rst @@ -27,8 +27,8 @@ SYNOPSIS | **mpv** \pvr:// [options] | **mpv** \dvb://[card\_number@]channel [options] | **mpv** \mf://[filemask|\@listfile] [-mf options] [options] -| **mpv** [cdda|cddb]://track[-endtrack][:speed][/device] [options] -| **mpv** [file|mms[t]|http|httpproxy|rt[s]p|ftp|udp|unsv|icyx|noicyx|smb]:// [user:pass\@]URL[:port] [options] +| **mpv** cdda://track[-endtrack][:speed][/device] [options] +| **mpv** [file|mms[t]|http|httpproxy|rt[s]p|ftp|udp|smb]:// [user:pass\@]URL[:port] [options] DESCRIPTION diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 0d83764d80..938e5d54ed 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1225,7 +1225,7 @@ same files from system wide configuration directories. Loading of some configuration files is not affected by this option, such - as configuration files for cddb, DVB code and fontconfig. + as configuration files for DVB code and fontconfig. *NOTE*: Files explicitly requested by command line options, like ``--include`` or ``--use-filedir-conf``, will still be loaded. |