diff options
| author | Andreas Huber <andih@google.com> | 2009-10-16 13:02:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-16 13:02:24 -0700 |
| commit | 07914840dfd18e34fd4789cfc21522a0f4e0970d (patch) | |
| tree | 22995eff5c814ed9d628a14f60dfbb957057b405 /cmds | |
| parent | ae655549981d1cbcd1e54669341a698a51a7e902 (diff) | |
| parent | 4b9dbdfa1805cfb5be1eca2d26ca18a01724839a (diff) | |
| download | frameworks_base-07914840dfd18e34fd4789cfc21522a0f4e0970d.zip frameworks_base-07914840dfd18e34fd4789cfc21522a0f4e0970d.tar.gz frameworks_base-07914840dfd18e34fd4789cfc21522a0f4e0970d.tar.bz2 | |
am 4b9dbdfa: am d96f6e85: Merge change I8176f35e into eclair-mr2
Merge commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a'
* commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a':
Reimplement the OMX backend for stagefright.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index 4d4d013..7dc99c1 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -273,7 +273,7 @@ int main(int argc, char **argv) { CHECK(service.get() != NULL); - sp<IOMX> omx = service->createOMX(); + sp<IOMX> omx = service->getOMX(); CHECK(omx.get() != NULL); const char *kMimeTypes[] = { @@ -319,11 +319,11 @@ int main(int argc, char **argv) { CHECK(service.get() != NULL); - sp<IOMX> omx = service->createOMX(); + sp<IOMX> omx = service->getOMX(); CHECK(omx.get() != NULL); List<String8> list; - omx->list_nodes(&list); + omx->listNodes(&list); for (List<String8>::iterator it = list.begin(); it != list.end(); ++it) { |