From 2aea6323bd406049db05e1d5d6c44935f44da6f3 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Wed, 6 Nov 2013 13:31:02 +0200 Subject: input_avio: use '+' instead of ':' as protocol separator. xine does not regonize string as mrl if there are multiple ':' in protocol part. --- ChangeLog | 4 ++-- src/combined/ffmpeg/input_avio.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fb9902dd..47b7e52f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,8 @@ xine-lib (1.2.5) 201?-??-?? * Add avio (libavformat) input plugin: - Support for new protocols (https://, ftp://, sftp://, ...). - - Support for seekable http streams (with avio:http:// mrl). - - By default native xine input plugins are used. This can be overridden in config or by using avio: mrl prefix. + - Support for seekable http streams (with "avio+http://" mrl). + - By default native xine input plugins are used. This can be overridden in config or by using "avio+" mrl prefix. * Recognise & use HEVC/H.265. (ffmpeg) * Add support for HEVC/H.265 to the mpeg-ts demuxer. * Add support for HEVC/H.265 and VP9 to the matroska demuxer. diff --git a/src/combined/ffmpeg/input_avio.c b/src/combined/ffmpeg/input_avio.c index a3568ad40..47e448f85 100644 --- a/src/combined/ffmpeg/input_avio.c +++ b/src/combined/ffmpeg/input_avio.c @@ -289,7 +289,7 @@ static int is_avio_supported_protocol(xine_t *xine, const char *mrl) static input_plugin_t *input_avio_get_instance (input_class_t *cls_gen, xine_stream_t *stream, const char *mrl) { avio_input_plugin_t *this; - const int proto_len = strlen(INPUT_AVIO_ID":"); + const int proto_len = strlen(INPUT_AVIO_ID"+"); if (!mrl || !*mrl) { return NULL; @@ -301,8 +301,8 @@ static input_plugin_t *input_avio_get_instance (input_class_t *cls_gen, xine_str } /* always accept own protocol */ - /* avio:http:// ... --> use avio instead of xine native http plugin */ - if (!strncasecmp (mrl, INPUT_AVIO_ID":", proto_len)) { + /* avio+http:// ... --> use avio instead of xine native http plugin */ + if (!strncasecmp (mrl, INPUT_AVIO_ID"+", proto_len)) { mrl += proto_len; } -- cgit v1.2.3