diff options
| author | James Dong <jdong@google.com> | 2012-08-27 10:14:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-27 10:14:23 -0700 |
| commit | 1c356d38527efbbee0894188c0a8f82074b0f441 (patch) | |
| tree | 15a9f511a77a8817f02c558883052dd754298a2d /include | |
| parent | 690921927f289da73556ea71c28981194af8ffcd (diff) | |
| parent | aa8879d381918335c9d829fc279b76d53a15a550 (diff) | |
| download | frameworks_av-1c356d38527efbbee0894188c0a8f82074b0f441.zip frameworks_av-1c356d38527efbbee0894188c0a8f82074b0f441.tar.gz frameworks_av-1c356d38527efbbee0894188c0a8f82074b0f441.tar.bz2 | |
Merge "Fixed a native crash due to unexpected state at destroy time when encoder component's source fails to start" into jb-mr1-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index bb9e595..e6739ae 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -354,6 +354,8 @@ private: const void *data, size_t size, unsigned *profile, unsigned *level); + status_t stopOmxComponent_l(); + OMXCodec(const OMXCodec &); OMXCodec &operator=(const OMXCodec &); }; |