Merge "Don't release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp" into honeycomb

2011-01-11 08:56:02 -08:00
parent 53ee3316bc 545c22ffd2
commit f2e48873ae
1 changed files with 2 additions and 1 deletions
--- a/media/libstagefright/CameraSourceTimeLapse.cpp
+++ b/media/libstagefright/CameraSourceTimeLapse.cpp
@@ -347,7 +347,8 @@ void CameraSourceTimeLapse::stopCameraRecording() {
 }

 void CameraSourceTimeLapse::releaseRecordingFrame(const sp<IMemory>& frame) {
-    if (!mUseStillCameraForTimeLapse) {
+    if (!mUseStillCameraForTimeLapse &&
+        mCamera != NULL) {
        mCamera->releaseRecordingFrame(frame);
    }
 }