diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-17 20:03:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 20:03:48 +0000 |
| commit | d86450b93ab3960ccd68aed14563aaa76b43ce9b (patch) | |
| tree | a6a2057e69e40f15b8437a086b3fb9b49bfc4542 /cmds | |
| parent | 2716969d2b88e85a6ed5a766b54a0a34dc137118 (diff) | |
| parent | c80b9b834b2e443a2010e3b6d90d50d8b4a60fe4 (diff) | |
| download | frameworks_av-d86450b93ab3960ccd68aed14563aaa76b43ce9b.zip frameworks_av-d86450b93ab3960ccd68aed14563aaa76b43ce9b.tar.gz frameworks_av-d86450b93ab3960ccd68aed14563aaa76b43ce9b.tar.bz2 | |
am c80b9b83: Merge "Fix struct vs. class mismatches"
* commit 'c80b9b834b2e443a2010e3b6d90d50d8b4a60fe4':
Fix struct vs. class mismatches
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/SineSource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/stagefright/SineSource.h b/cmds/stagefright/SineSource.h index 76ab669..d772e0d 100644 --- a/cmds/stagefright/SineSource.h +++ b/cmds/stagefright/SineSource.h @@ -6,7 +6,7 @@ namespace android { -struct MediaBufferGroup; +class MediaBufferGroup; struct SineSource : public MediaSource { SineSource(int32_t sampleRate, int32_t numChannels); |