diff options
| author | Andreas Huber <andih@google.com> | 2013-04-17 19:52:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-17 19:52:14 +0000 |
| commit | 03fb6f01a39f11c1c90f60d16999fa274402f465 (patch) | |
| tree | 9b6e12af61ddb568797c3504e007a7143f9729d5 /media | |
| parent | 96ef6f1bb8c5832682a9576c0e43b6c85e4f5c1b (diff) | |
| parent | be2bda4abed36eb6adf474c317d1492b4aec8f1a (diff) | |
| download | frameworks_av-03fb6f01a39f11c1c90f60d16999fa274402f465.zip frameworks_av-03fb6f01a39f11c1c90f60d16999fa274402f465.tar.gz frameworks_av-03fb6f01a39f11c1c90f60d16999fa274402f465.tar.bz2 | |
Merge "Parse the last none-empty line of .m3u8 file" into jb-mr2-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 3 |
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') { |