[vlc-commits] demux: adaptative: check token existence
Francois Cartegnie
git at videolan.org
Sun Jul 26 21:59:44 CEST 2015
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Jul 26 21:57:58 2015 +0200| [ee12bb0752ebee80d910d45f536267ede945d474] | committer: Francois Cartegnie
demux: adaptative: check token existence
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ee12bb0752ebee80d910d45f536267ede945d474
---
modules/demux/adaptative/tools/Helper.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/demux/adaptative/tools/Helper.cpp b/modules/demux/adaptative/tools/Helper.cpp
index 10f121e..40e10c6 100644
--- a/modules/demux/adaptative/tools/Helper.cpp
+++ b/modules/demux/adaptative/tools/Helper.cpp
@@ -49,9 +49,9 @@ std::string Helper::combinePaths (const std::string &path1, const std::st
}
std::string Helper::getDirectoryPath (const std::string &path)
{
- int pos = path.find_last_of('/');
+ std::size_t pos = path.find_last_of('/');
- return path.substr(0, pos);
+ return (pos != std::string::npos) ? path.substr(0, pos) : path;
}
bool Helper::ifind(std::string haystack, std::string needle)
More information about the vlc-commits
mailing list