diff options
| author | Andreas Huber <andih@google.com> | 2009-11-10 12:00:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-10 12:00:03 -0800 |
| commit | f814fc6c4b785d3748c65b38ab99681494f763fb (patch) | |
| tree | f0951345219e49ebb57007899e3d1a33f9f856eb /cmds | |
| parent | f4857040d487a06885754922e604532273294d92 (diff) | |
| parent | 45e89568b6004db847b9e4057e386aa7db2e764c (diff) | |
| download | frameworks_base-f814fc6c4b785d3748c65b38ab99681494f763fb.zip frameworks_base-f814fc6c4b785d3748c65b38ab99681494f763fb.tar.gz frameworks_base-f814fc6c4b785d3748c65b38ab99681494f763fb.tar.bz2 | |
am 45e89568: am d71ab51a: Merge change I3e1bdd38 into eclair-mr2
Merge commit '45e89568b6004db847b9e4057e386aa7db2e764c'
* commit '45e89568b6004db847b9e4057e386aa7db2e764c':
Transcode files again.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/record.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp index 0025c5e..8c25d85 100644 --- a/cmds/stagefright/record.cpp +++ b/cmds/stagefright/record.cpp @@ -133,6 +133,8 @@ sp<MediaSource> createSource(const char *filename) { int main(int argc, char **argv) { android::ProcessState::self()->startThreadPool(); + DataSource::RegisterDefaultSniffers(); + #if 1 if (argc != 2) { fprintf(stderr, "usage: %s filename\n", argv[0]); @@ -142,7 +144,7 @@ int main(int argc, char **argv) { OMXClient client; CHECK_EQ(client.connect(), OK); -#if 0 +#if 1 sp<MediaSource> source = createSource(argv[1]); if (source == NULL) { |