diff options
| author | Andreas Huber <andih@google.com> | 2009-10-23 10:26:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-23 10:26:18 -0700 |
| commit | d919aa74927fcabd18a9ea14a57f44240aecc7af (patch) | |
| tree | ce63ca089cd7eaaf1b4e7d7a520824675dc89ec0 /cmds | |
| parent | 79b609722ef2121368b2f40a0e67ac9fecc23b7c (diff) | |
| parent | 9069aa31accee9c23a4cf228ca27fe8fa8506a56 (diff) | |
| download | frameworks_base-d919aa74927fcabd18a9ea14a57f44240aecc7af.zip frameworks_base-d919aa74927fcabd18a9ea14a57f44240aecc7af.tar.gz frameworks_base-d919aa74927fcabd18a9ea14a57f44240aecc7af.tar.bz2 | |
am 9069aa31: Merge change I57515f33 into eclair-mr2
Merge commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56' into eclair-mr2-plus-aosp
* commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56':
Moving the individual extractor headers files to the private include directory.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/record.cpp | 6 |
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(); |