diff options
| author | Andreas Huber <andih@google.com> | 2010-08-27 18:09:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 18:09:21 -0700 |
| commit | 84ecebb92217ff42ed34cfd9bce9c13de3635b49 (patch) | |
| tree | 464ef02e82607459cced769f3569ba2c0a7acdfe /media | |
| parent | 1c8082b205c14a321d770e84dcab03ffe86ef27f (diff) | |
| parent | e25e03612e1a2988ed83f24d2658cf0898fd1944 (diff) | |
| download | frameworks_base-84ecebb92217ff42ed34cfd9bce9c13de3635b49.zip frameworks_base-84ecebb92217ff42ed34cfd9bce9c13de3635b49.tar.gz frameworks_base-84ecebb92217ff42ed34cfd9bce9c13de3635b49.tar.bz2 | |
am e25e0361: am e250c220: Merge "We accidentally always aborted after 10 secs, even if the connection was fine." into gingerbread
Merge commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944'
* commit 'e25e03612e1a2988ed83f24d2658cf0898fd1944':
We accidentally always aborted after 10 secs, even if the connection was fine.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/rtsp/MyHandler.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h index e721dd7..bc8b58a 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -480,9 +480,8 @@ struct MyHandler : public AHandler { { if (mFirstAccessUnit) { LOG(WARNING) << "Never received any data, disconnecting."; - + (new AMessage('abor', id()))->post(); } - (new AMessage('abor', id()))->post(); break; } |