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/libmediaplayerservice/StagefrightPlayer.cpp | |
| 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/libmediaplayerservice/StagefrightPlayer.cpp')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightPlayer.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/media/libmediaplayerservice/StagefrightPlayer.cpp b/media/libmediaplayerservice/StagefrightPlayer.cpp index e105eae..6d7771a 100644 --- a/media/libmediaplayerservice/StagefrightPlayer.cpp +++ b/media/libmediaplayerservice/StagefrightPlayer.cpp @@ -69,12 +69,6 @@ status_t StagefrightPlayer::setDataSource(const sp<IStreamSource> &source) { return mPlayer->setDataSource(source); } -status_t StagefrightPlayer::setVideoSurface(const sp<Surface> &surface) { - ALOGV("setVideoSurface"); - - return mPlayer->setSurface(surface); -} - status_t StagefrightPlayer::setVideoSurfaceTexture( const sp<ISurfaceTexture> &surfaceTexture) { ALOGV("setVideoSurfaceTexture"); |