From eb787267c845be8f0fdf717c46591b41e86600c8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 8 Dec 2012 15:41:03 +0100 Subject: stream: handle mms streaming with ffmpeg Use ffmpeg (stream_lavf) instead of internal mms support (asf_streaming.c) for mms://, mmsh://, mmst:// URLs. The old implementation is available under mp_mms:// etc. There are some caveats with this: - mms:// now always maps to mmsh://. It won't try mmst://. (I'm not sure if mms:// URLs really can use the mmst protocol, though.) - MMS streams under the http:// prefix are not handled. (ffmpeg ticket #2001.) (Was already broken in mpv since c02f25.) - It downloads all video streams now. MMS streams often have redundant video streams, which encode the main stream at different quality. The client is supposed to select one according to its bandwidth requirements. (Explicit MMS stream selection has been broken in mpv for a while, because MPOpts.vid maps to the stream number, not the demuxer's stream ID - but the old logic doesn't work anyway when using demuxer_lavf as opposed to demux_asf.) --- stream/stream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stream/stream.h') diff --git a/stream/stream.h b/stream/stream.h index 9f2be2f817..ebab587f03 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -81,7 +81,7 @@ #define STREAM_ERROR 0 #define STREAM_OK 1 -#define MAX_STREAM_PROTOCOLS 10 +#define MAX_STREAM_PROTOCOLS 20 #define STREAM_CTRL_RESET 0 #define STREAM_CTRL_GET_TIME_LENGTH 1 -- cgit v1.2.3