diff options
| author | Andreas Huber <andih@google.com> | 2011-11-08 10:40:20 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-11-08 10:40:20 -0800 |
| commit | 471af5aaea2d2491a77dba379771f7c96b9ca3c3 (patch) | |
| tree | 29609e7feb5c548e28ce94f88b4445c5c373d725 /media/libstagefright/include | |
| parent | 3b86c964df855a9740c446e984309b719c3ec37c (diff) | |
| parent | 936a981ba15d528a023311aa32f46446813551d9 (diff) | |
| download | frameworks_av-471af5aaea2d2491a77dba379771f7c96b9ca3c3.zip frameworks_av-471af5aaea2d2491a77dba379771f7c96b9ca3c3.tar.gz frameworks_av-471af5aaea2d2491a77dba379771f7c96b9ca3c3.tar.bz2 | |
resolved conflicts for merge of 26f70db9 to master
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 7d6bcad..c13d6cb 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -81,7 +81,6 @@ struct AwesomePlayer { bool isPlaying() const; - status_t setSurface(const sp<Surface> &surface); status_t setSurfaceTexture(const sp<ISurfaceTexture> &surfaceTexture); void setAudioSink(const sp<MediaPlayerBase::AudioSink> &audioSink); status_t setLooping(bool shouldLoop); @@ -154,7 +153,6 @@ private: bool mUIDValid; uid_t mUID; - sp<Surface> mSurface; sp<ANativeWindow> mNativeWindow; sp<MediaPlayerBase::AudioSink> mAudioSink; |