summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-03-07 02:26:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 02:26:00 +0000
commitf7e6f7c096167f99f643371eb6a7cb7455c4f0fc (patch)
treeae1499e926a1fdf640a5f6d7e4787a194cfbfe31 /media/libstagefright
parent908d31d763e46d56b1f437e90213ed14cd2b64e5 (diff)
parent44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc (diff)
downloadframeworks_av-f7e6f7c096167f99f643371eb6a7cb7455c4f0fc.zip
frameworks_av-f7e6f7c096167f99f643371eb6a7cb7455c4f0fc.tar.gz
frameworks_av-f7e6f7c096167f99f643371eb6a7cb7455c4f0fc.tar.bz2
am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"
* commit '44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc': M3UParser: Fix typo in 8883a38a308
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/httplive/M3UParser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 292d1c4..5ef7c0f 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -425,7 +425,7 @@ static bool MakeURL(const char *baseURL, const char *url, AString *out) {
end = strlen(baseURL);
}
// Check for the last slash before a potential query string
- for (ssize_t pos - 1 = end; pos >= 0; pos--) {
+ for (ssize_t pos = end - 1; pos >= 0; pos--) {
if (baseURL[pos] == '/') {
end = pos;
break;