diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-22 22:40:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-22 22:40:34 +0000 |
| commit | d48a3abfede5a95124ba11aec53f6d3e19adfc5d (patch) | |
| tree | d98b883f6dfa0800d4409797ed75c2c48e9a0279 /include | |
| parent | 9b3d384753658a2b7985b1f4d124b09a8fb8f3b6 (diff) | |
| parent | 11f437a6665167d8aee6db59df6e4753aa190bf7 (diff) | |
| download | frameworks_av-d48a3abfede5a95124ba11aec53f6d3e19adfc5d.zip frameworks_av-d48a3abfede5a95124ba11aec53f6d3e19adfc5d.tar.gz frameworks_av-d48a3abfede5a95124ba11aec53f6d3e19adfc5d.tar.bz2 | |
am 11f437a6: am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev
* commit '11f437a6665167d8aee6db59df6e4753aa190bf7':
stagefright: try to free codec instance if MediaCodec.release hangs
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index d77ddaf..fcccc6d 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -120,6 +120,7 @@ private: kWhatSetParameters = 'setP', kWhatSubmitOutputMetaDataBufferIfEOS = 'subm', kWhatOMXDied = 'OMXd', + kWhatReleaseCodecInstance = 'relC', }; enum { |