summaryrefslogtreecommitdiffstats
path: root/stream/stream_lavf.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-07 19:40:14 +0200
committerwm4 <wm4@nowhere>2013-07-07 19:42:38 +0200
commit854303ad49d188d96af8151b290162916c81c993 (patch)
treed47fc0ccd34adf47df7612c8b213d09b3816eae5 /stream/stream_lavf.c
parentfeaa721916303c36dcd676c11ac74ecdec2db006 (diff)
downloadmpv-854303ad49d188d96af8151b290162916c81c993.tar.bz2
mpv-854303ad49d188d96af8151b290162916c81c993.tar.xz
Remove internal network support
This commit removes the "old" networking code in favor of libavformat's code. The code was still used for mp_http, udp, ftp, cddb. http has been mapped to libavformat's http support since approximately 6 months ago. udp and ftp have support in ffmpeg (though ftp was added only last month). cddb support is removed with this commit - it's probably not important and rarely used if at all, so we don't care about it.
Diffstat (limited to 'stream/stream_lavf.c')
-rw-r--r--stream/stream_lavf.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index 640c719109..3223bc3eaa 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -28,7 +28,6 @@
#include "core/m_struct.h"
#include "demux/demux.h"
-#include "network.h"
#include "cookies.h"
#include "core/bstr.h"
@@ -317,7 +316,7 @@ const stream_info_t stream_info_ffmpeg = {
"",
open_f,
{ "lavf", "ffmpeg", "rtmp", "rtsp", "http", "https", "mms", "mmst", "mmsh",
- "mmshttp", NULL },
+ "mmshttp", "udp", "ftp", NULL },
NULL,
1 // Urls are an option string
};