diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-04 13:56:04 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-04 13:56:04 -0800 |
| commit | 6bc1c721cab472b5e270b61c8f106d8f17fcecdc (patch) | |
| tree | 3784861eb415ccd67ed1935c04180f44398e668d /media/libstagefright/ACodec.cpp | |
| parent | f032c781e72f10bad56cc625152e6dffc87dd0a7 (diff) | |
| parent | ce9e446bd8c72972af86917563225e618b49d451 (diff) | |
| download | frameworks_av-6bc1c721cab472b5e270b61c8f106d8f17fcecdc.zip frameworks_av-6bc1c721cab472b5e270b61c8f106d8f17fcecdc.tar.gz frameworks_av-6bc1c721cab472b5e270b61c8f106d8f17fcecdc.tar.bz2 | |
Merge branch 'LA.BF64.1.2.2_rb4.6' of git://codeaurora.org/platform/frameworks/av into cm-13.0
Change-Id: Iec8118b9a24fafe47e4006fca8a8e993bacb5ba8
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index a01c63a..83954f9 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -626,8 +626,8 @@ void ACodec::initiateShutdown(bool keepComponentAllocated) { msg->setInt32("keepComponentAllocated", keepComponentAllocated); msg->post(); if (!keepComponentAllocated) { - // ensure shutdown completes in 10 seconds - (new AMessage(kWhatReleaseCodecInstance, this))->post(10000000); + // ensure shutdown completes in 30 seconds + (new AMessage(kWhatReleaseCodecInstance, this))->post(30000000); } } |