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 | 437ab8c4b66a6c9dc47faa257df90089ebef10a9 (patch) | |
tree | 404b427fce1897096489c670139fe89b42075e4d /media/libstagefright | |
parent | c579249e771ea8f4b57491ead4cf6f36420c4263 (diff) | |
parent | 6adecf466b58ceb3adac535b83a7505801f0f093 (diff) | |
download | frameworks_av-437ab8c4b66a6c9dc47faa257df90089ebef10a9.zip frameworks_av-437ab8c4b66a6c9dc47faa257df90089ebef10a9.tar.gz frameworks_av-437ab8c4b66a6c9dc47faa257df90089ebef10a9.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/libstagefright')
-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; } |