diff options
| author | Andreas Huber <andih@google.com> | 2013-07-31 09:01:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-31 09:01:12 -0700 |
| commit | 9610adc395d18e474e6e35c0bc8b9c3220e6e525 (patch) | |
| tree | ed65c8fab052c779c0fdda4e2b83d6dbe3f8410e | |
| parent | b08ab81bab9e8cd2e3a7fff02725a387070fd078 (diff) | |
| parent | b57fb786a32d4ea78cd8bbf24a65593353d87a88 (diff) | |
| download | frameworks_av-9610adc395d18e474e6e35c0bc8b9c3220e6e525.zip frameworks_av-9610adc395d18e474e6e35c0bc8b9c3220e6e525.tar.gz frameworks_av-9610adc395d18e474e6e35c0bc8b9c3220e6e525.tar.bz2 | |
am b57fb786: am d0ef1ccd: Merge "rtsp handle response line ended with \'\n\'"
* commit 'b57fb786a32d4ea78cd8bbf24a65593353d87a88':
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 906aef3..5116550 100644 --- a/media/libstagefright/rtsp/ARTSPConnection.cpp +++ b/media/libstagefright/rtsp/ARTSPConnection.cpp @@ -571,6 +571,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); |