diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-03 09:40:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-03 09:40:17 -0700 |
| commit | f619028470b63ba1c8e9d86fd2faab7bbece873b (patch) | |
| tree | ffe69c3742fe8759afd11e37d22dfa1d4bba07ba /cmds | |
| parent | 8e65337d06a1cc4fe896d17a947d46ae5f7257a8 (diff) | |
| parent | 4c48342572503c7a92e5634ef8db3f1f9e541256 (diff) | |
| download | frameworks_base-f619028470b63ba1c8e9d86fd2faab7bbece873b.zip frameworks_base-f619028470b63ba1c8e9d86fd2faab7bbece873b.tar.gz frameworks_base-f619028470b63ba1c8e9d86fd2faab7bbece873b.tar.bz2 | |
Merge change 23715 into eclair
* changes:
Setting the component role appears to be mandatory now for all mime types.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/record.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cmds/stagefright/record.cpp b/cmds/stagefright/record.cpp index c049594..81a1c0a 100644 --- a/cmds/stagefright/record.cpp +++ b/cmds/stagefright/record.cpp @@ -50,11 +50,6 @@ public: return meta; } - virtual status_t getMaxSampleSize(size_t *max_size) { - *max_size = mSize; - return OK; - } - virtual status_t start(MetaData *params) { return OK; } @@ -209,7 +204,7 @@ int main(int argc, char **argv) { return 0; } -#endif +#else int main(int argc, char **argv) { android::ProcessState::self()->startThreadPool(); @@ -265,4 +260,4 @@ int main(int argc, char **argv) { return 0; } - +#endif |