diff options
| author | Andreas Huber <andih@google.com> | 2009-10-21 15:24:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-21 15:24:07 -0700 |
| commit | 917d0aece5c9395892c3a8e7191f04a1e2ca6330 (patch) | |
| tree | e7f69f66e635c2d7a3317749ac44de15d163dab7 /include | |
| parent | 85356bac4a1246537d16e95b7929da5a4715ab1d (diff) | |
| parent | bfd5b38673212c47f0e386c0a8370d4ff47bd2fe (diff) | |
| download | frameworks_base-917d0aece5c9395892c3a8e7191f04a1e2ca6330.zip frameworks_base-917d0aece5c9395892c3a8e7191f04a1e2ca6330.tar.gz frameworks_base-917d0aece5c9395892c3a8e7191f04a1e2ca6330.tar.bz2 | |
am bfd5b386: Merge change If68c168d into eclair-mr2
Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp
* commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe':
Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index ec043a9..dfc902e 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -106,7 +106,6 @@ private: sp<IOMX> mOMX; IOMX::node_id mNode; - sp<OMXCodecObserver> mObserver; uint32_t mQuirks; bool mIsEncoder; char *mMIME; |