diff options
| author | Andreas Huber <andih@google.com> | 2013-07-31 08:52:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-31 08:52:41 -0700 |
| commit | b57fb786a32d4ea78cd8bbf24a65593353d87a88 (patch) | |
| tree | 5cd5927f4d025cf98bdf9c0d616fd6388752fa0a | |
| parent | f2d744d9535ca59be6cd878830176f81a0a8fbc6 (diff) | |
| parent | d0ef1ccd987e650e025b840e72f91770d03a5110 (diff) | |
| download | frameworks_av-b57fb786a32d4ea78cd8bbf24a65593353d87a88.zip frameworks_av-b57fb786a32d4ea78cd8bbf24a65593353d87a88.tar.gz frameworks_av-b57fb786a32d4ea78cd8bbf24a65593353d87a88.tar.bz2 | |
am d0ef1ccd: Merge "rtsp handle response line ended with \'\n\'"
* commit 'd0ef1ccd987e650e025b840e72f91770d03a5110':
rtsp handle response line ended with '\n'
| -rw-r--r-- | media/libstagefright/rtsp/ARTSPConnection.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp index 3068541..8b209c4 100644 --- a/media/libstagefright/rtsp/ARTSPConnection.cpp +++ b/media/libstagefright/rtsp/ARTSPConnection.cpp @@ -565,6 +565,9 @@ bool ARTSPConnection::receiveLine(AString *line) { if (sawCR && c == '\n') { line->erase(line->size() - 1, 1); return true; + } else if (c == '\n') { + // some reponse line ended with '\n', instead of '\r\n'. + return true; } line->append(&c, 1); |