diff options
| author | Andreas Huber <andih@google.com> | 2012-11-29 09:49:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-29 09:49:35 -0800 |
| commit | 504dd3fdad2e1f59eb553ea2d4f94235eb7a8472 (patch) | |
| tree | f7361f944f76236d964777ebe7558d678720db84 /media | |
| parent | 2546219a54970e0ad53bd218586cdc48d6039b20 (diff) | |
| parent | 37ddc8fc0f78234b5b3b58886113560cdf98aadf (diff) | |
| download | frameworks_av-504dd3fdad2e1f59eb553ea2d4f94235eb7a8472.zip frameworks_av-504dd3fdad2e1f59eb553ea2d4f94235eb7a8472.tar.gz frameworks_av-504dd3fdad2e1f59eb553ea2d4f94235eb7a8472.tar.bz2 | |
am 37ddc8fc: am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"
* commit '37ddc8fc0f78234b5b3b58886113560cdf98aadf':
Unsolicited server responses cause RTSP streaming to crash
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/rtsp/ARTSPConnection.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp index 539a888..161bd4f 100644 --- a/media/libstagefright/rtsp/ARTSPConnection.cpp +++ b/media/libstagefright/rtsp/ARTSPConnection.cpp @@ -830,6 +830,7 @@ status_t ARTSPConnection::findPendingRequest( if (i < 0) { // This is an unsolicited server->client message. + *index = -1; return OK; } |