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 /stream/stream_lavf.c | |
| 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 'stream/stream_lavf.c')
| -rw-r--r-- | stream/stream_lavf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index 9a5249db54..48d5e9d173 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -313,7 +313,7 @@ const stream_info_t stream_info_ffmpeg = { "", open_f, { "lavf", "ffmpeg", "rtmp", "rtsp", "http", "https", "mms", "mmst", "mmsh", - "mmshttp", "udp", "ftp", NULL }, + "mmshttp", "udp", "ftp", "rtp", "httpproxy", NULL }, NULL, 1 // Urls are an option string }; |