diff options
| author | James Dong <jdong@google.com> | 2011-07-14 09:59:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-14 09:59:24 -0700 |
| commit | ad07457ece56ba710d3a0334eb8e711646c7141a (patch) | |
| tree | ee9c0ae0e03fe26b28aa7c68059179330f3bc0e7 /include | |
| parent | 840a02c3da40934bd3b4ab023d6d92f7161c6f4b (diff) | |
| parent | fbb170ca9cbbd0c87c71ac39ecbb36086bca5ee2 (diff) | |
| download | frameworks_base-ad07457ece56ba710d3a0334eb8e711646c7141a.zip frameworks_base-ad07457ece56ba710d3a0334eb8e711646c7141a.tar.gz frameworks_base-ad07457ece56ba710d3a0334eb8e711646c7141a.tar.bz2 | |
Merge "Support profile and level query for SW video decoders"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IOMX.h | 5 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 3c65147..02ad703 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -184,6 +184,11 @@ public: uint32_t flags = 0); }; +struct CodecProfileLevel { + OMX_U32 mProfile; + OMX_U32 mLevel; +}; + } // namespace android #endif // ANDROID_IOMX_H_ diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 7f3c497..a042ddb 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -336,11 +336,6 @@ private: OMXCodec &operator=(const OMXCodec &); }; -struct CodecProfileLevel { - OMX_U32 mProfile; - OMX_U32 mLevel; -}; - struct CodecCapabilities { String8 mComponentName; Vector<CodecProfileLevel> mProfileLevels; |