summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-04-17 19:52:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-17 19:52:14 +0000
commited86384591c0bf7ee2d227a6c56e85aa54bfaeac (patch)
tree841d8b8ed193f9dffc7f96f909bf33104f17fde4 /media/libstagefright
parent9e0727caf75049f17f8237efa159cd4baf699de7 (diff)
parent1e0757e0a63d876acc65991ac73284227c522bdc (diff)
downloadframeworks_av-ed86384591c0bf7ee2d227a6c56e85aa54bfaeac.zip
frameworks_av-ed86384591c0bf7ee2d227a6c56e85aa54bfaeac.tar.gz
frameworks_av-ed86384591c0bf7ee2d227a6c56e85aa54bfaeac.tar.bz2
Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/httplive/M3UParser.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 44e03dc..68bbca2 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -163,9 +163,6 @@ status_t M3UParser::parse(const void *_data, size_t size) {
while (offsetLF < size && data[offsetLF] != '\n') {
++offsetLF;
}
- if (offsetLF >= size) {
- break;
- }
AString line;
if (offsetLF > offset && data[offsetLF - 1] == '\r') {