diff options
| author | Memphiz <memphis@machzwo.de> | 2012-11-25 13:34:26 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2012-11-25 19:29:13 +0100 |
| commit | e9319d2e25838f28246353c4bbf28672865def27 (patch) | |
| tree | 71b91bb95ccc4fb9252dcc805fed5e68703af777 | |
| parent | ae04d9992e796683bd36da18df6974d11160061c (diff) | |
[dvdinputstream] - remove any "|option" options from the strFileName which might have sneaked in (since some m3u8 urls are now handled by inputstreamffmpeg). Those options should only hit our curlfile impl - others can't do anything with the suffixed options and will fail.
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp index 8649c6bb3a..219618270f 100644 --- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp +++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp @@ -19,6 +19,7 @@ */ #include "DVDInputStream.h" +#include "URL.h" CDVDInputStream::CDVDInputStream(DVDStreamType streamType) { @@ -31,7 +32,13 @@ CDVDInputStream::~CDVDInputStream() bool CDVDInputStream::Open(const char* strFile, const std::string &content) { - m_strFileName = strFile; + CURL url = CURL(strFile); + + // get rid of any |option parameters which might have sneaked in here + // those are only handled by our curl impl. + url.SetProtocolOptions(""); + m_strFileName = url.Get(); + m_content = content; return true; } |