diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-07 09:57:12 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-12-07 09:57:12 -0800 |
| commit | 5921fb51e0219ddd7cad439a73495f320c57d50e (patch) | |
| tree | 8a900ec9ed0ebf435bffa59c5e72d6f053518468 /media | |
| parent | 9e3e2d3a6967301730fd383e8b04d53fdfd008e5 (diff) | |
| parent | 91eb0354043842d96bf3ef201ce68046db70df74 (diff) | |
| download | frameworks_base-5921fb51e0219ddd7cad439a73495f320c57d50e.zip frameworks_base-5921fb51e0219ddd7cad439a73495f320c57d50e.tar.gz frameworks_base-5921fb51e0219ddd7cad439a73495f320c57d50e.tar.bz2 | |
Merge change I91eb0354 into eclair-mr2
* changes:
Change OMXCodec::Create to return an sp<MediaSource> instead of an sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 670f748..7c77214 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -274,7 +274,7 @@ void OMXCodec::findMatchingCodecs( } // static -sp<OMXCodec> OMXCodec::Create( +sp<MediaSource> OMXCodec::Create( const sp<IOMX> &omx, const sp<MetaData> &meta, bool createEncoder, const sp<MediaSource> &source, |