diff options
| author | Lajos Molnar <lajos@google.com> | 2014-10-22 00:29:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-22 00:29:43 +0000 |
| commit | 258420480e1edc73b112a5994a8456e31c558860 (patch) | |
| tree | d36112992f8402264834df923ff0c7500c11c6de /include | |
| parent | 6ce19d24ff985cf845f04c2d6542ce03c7d07964 (diff) | |
| parent | 30358faf33fb9b638257b017fadb4c5f7352d903 (diff) | |
| download | frameworks_av-258420480e1edc73b112a5994a8456e31c558860.zip frameworks_av-258420480e1edc73b112a5994a8456e31c558860.tar.gz frameworks_av-258420480e1edc73b112a5994a8456e31c558860.tar.bz2 | |
Merge "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev
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 { |