commit 0fc736f321b01995d9f5913d2490cbb479554266
author Marco Nelissen <marcone@google.com> Fri Jul 10 09:34:59 2009 -0700
committer Marco Nelissen <marcone@google.com> Fri Jul 10 13:43:41 2009 -0700
tree 091b71ef6efb72b9dea36bb4d70d6ff5f8f1af87
parent b88993f073a353fba6a2d6e4510fad5a2a5b170d

Don't pass references to temporary objects, and handle the case where we dont have a Surface.

media/libmedia/mediaplayer.cpp

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 6b35fa7..aeb43c5 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -233,7 +233,10 @@
     LOGV("setVideoSurface");
     Mutex::Autolock _l(mLock);
     if (mPlayer == 0) return NO_INIT;
-    return  mPlayer->setVideoSurface(surface->getISurface());
+    if (surface != NULL)
+        return  mPlayer->setVideoSurface(surface->getISurface());
+    else
+        return  mPlayer->setVideoSurface(NULL);
 }
 
 // must call with lock held