diff options
| author | Marco Nelissen <marcone@google.com> | 2014-02-10 17:20:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 17:20:15 +0000 |
| commit | 15f08b1e75ab01d55e4cbab1f8d3570f354651f6 (patch) | |
| tree | dbd206692ee852fbaa0e3a6d4a1e4fc9525159ce /media | |
| parent | 7cbaf3be54b956727a0c7166c57ef46b4c844b94 (diff) | |
| parent | 44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc (diff) | |
| download | frameworks_av-15f08b1e75ab01d55e4cbab1f8d3570f354651f6.zip frameworks_av-15f08b1e75ab01d55e4cbab1f8d3570f354651f6.tar.gz frameworks_av-15f08b1e75ab01d55e4cbab1f8d3570f354651f6.tar.bz2 | |
am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"
* commit '44f2b8c2ff4baf64baa0510cd37ac178ef91b7bc':
M3UParser: Fix typo in 8883a38a308
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 2 |
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; |