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/libmedia/mediaplayer.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/libmedia/mediaplayer.cpp')
| -rw-r--r-- | media/libmedia/mediaplayer.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp index e365ca1..5853144 100644 --- a/media/libmedia/mediaplayer.cpp +++ b/media/libmedia/mediaplayer.cpp @@ -219,14 +219,6 @@ status_t MediaPlayer::getMetadata(bool update_only, bool apply_filter, Parcel *m return mPlayer->getMetadata(update_only, apply_filter, metadata); } -status_t MediaPlayer::setVideoSurface(const sp<Surface>& surface) -{ - ALOGV("setVideoSurface"); - Mutex::Autolock _l(mLock); - if (mPlayer == 0) return NO_INIT; - return mPlayer->setVideoSurface(surface); -} - status_t MediaPlayer::setVideoSurfaceTexture( const sp<ISurfaceTexture>& surfaceTexture) { |