diff options
| author | Dharmaray Kundargi <dharmaray@google.com> | 2011-01-17 11:40:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-17 11:40:16 -0800 |
| commit | 67cde67ff08b94ece035ac35a7a1b33b01677b1f (patch) | |
| tree | 09e37275bf66cc6ec260deab0910bb990b09802e /include | |
| parent | f9c1f51b261d45632625b501f44f2b2214ce3352 (diff) | |
| parent | ccb3506ed1845121b94f4e27244e61a46eb19815 (diff) | |
| download | frameworks_av-67cde67ff08b94ece035ac35a7a1b33b01677b1f.zip frameworks_av-67cde67ff08b94ece035ac35a7a1b33b01677b1f.tar.gz frameworks_av-67cde67ff08b94ece035ac35a7a1b33b01677b1f.tar.bz2 | |
am 307003a8: Merge "integrate videoeditor preview player." into honeycomb
* commit '307003a844c90458bcfd7398c44bbae734936238':
integrate videoeditor preview player.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AudioPlayer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/AudioPlayer.h b/include/media/stagefright/AudioPlayer.h index 37af032..d12ee9c 100644 --- a/include/media/stagefright/AudioPlayer.h +++ b/include/media/stagefright/AudioPlayer.h @@ -65,6 +65,7 @@ public: bool reachedEOS(status_t *finalStatus); private: + friend class VideoEditorAudioPlayer; sp<MediaSource> mSource; AudioTrack *mAudioTrack; |