summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-10-23 10:37:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-23 10:37:24 -0700
commitd437ac6a7c4fde988f7d737bafd30744137f3af8 (patch)
treefae3f2157f95abcc541b2b26ca92bed9c983aae7 /cmds
parenta6d36d81af5b19ca820f54a5b812268e59315cad (diff)
parentd919aa74927fcabd18a9ea14a57f44240aecc7af (diff)
downloadframeworks_base-d437ac6a7c4fde988f7d737bafd30744137f3af8.zip
frameworks_base-d437ac6a7c4fde988f7d737bafd30744137f3af8.tar.gz
frameworks_base-d437ac6a7c4fde988f7d737bafd30744137f3af8.tar.bz2
am d919aa74: am 9069aa31: Merge change I57515f33 into eclair-mr2
Merge commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af' * commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af': Moving the individual extractor headers files to the private include directory.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/stagefright/record.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp
index 323d448..176dab0 100644
--- a/cmds/stagefright/record.cpp
+++ b/cmds/stagefright/record.cpp
@@ -23,7 +23,7 @@
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MetaData.h>
-#include <media/stagefright/MPEG4Extractor.h>
+#include <media/stagefright/MediaExtractor.h>
#include <media/stagefright/MPEG4Writer.h>
#include <media/stagefright/MmapSource.h>
#include <media/stagefright/OMXClient.h>
@@ -88,8 +88,8 @@ private:
sp<MediaSource> createSource(const char *filename) {
sp<MediaSource> source;
- sp<MPEG4Extractor> extractor =
- new MPEG4Extractor(new MmapSource(filename));
+ sp<MediaExtractor> extractor =
+ MediaExtractor::Create(new MmapSource(filename));
size_t num_tracks = extractor->countTracks();