summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/OMXCodec.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-06-23 16:40:57 -0700
committerAndreas Huber <andih@google.com>2010-06-23 16:40:57 -0700
commit608d77b1cf4fb9f63dc861e4e1fa3e80a732f626 (patch)
tree924276911b6c7b1cc35951709030559111aabe2c /media/libstagefright/OMXCodec.cpp
parentd255a4e04d06796441ae234e8f3a8277578b3446 (diff)
downloadframeworks_av-608d77b1cf4fb9f63dc861e4e1fa3e80a732f626.zip
frameworks_av-608d77b1cf4fb9f63dc861e4e1fa3e80a732f626.tar.gz
frameworks_av-608d77b1cf4fb9f63dc861e4e1fa3e80a732f626.tar.bz2
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce related-to-bug: 2370115
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
-rw-r--r--media/libstagefright/OMXCodec.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 8979c3b..02a073e 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -425,7 +425,6 @@ sp<MediaSource> OMXCodec::Create(
for (size_t i = 0; i < matchingCodecs.size(); ++i) {
componentName = matchingCodecs[i].string();
-#if BUILD_WITH_FULL_STAGEFRIGHT
sp<MediaSource> softwareCodec = createEncoder?
InstantiateSoftwareEncoder(componentName, source, meta):
InstantiateSoftwareCodec(componentName, source);
@@ -435,7 +434,6 @@ sp<MediaSource> OMXCodec::Create(
return softwareCodec;
}
-#endif
LOGV("Attempting to allocate OMX node '%s'", componentName);