am b447763d: am f2e48873: Merge "Don\'t release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp" into honeycomb
* commit 'b447763d6e3f564d7f02969b117e165b47fb14cb':
Don't release the video recording frame after recording is stopped in CameraSourceTimeLapse.cpp
diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp
index 9677838..31b6ec9 100644
--- a/media/libstagefright/CameraSourceTimeLapse.cpp
+++ b/media/libstagefright/CameraSourceTimeLapse.cpp
@@ -347,7 +347,8 @@
}
void CameraSourceTimeLapse::releaseRecordingFrame(const sp<IMemory>& frame) {
- if (!mUseStillCameraForTimeLapse) {
+ if (!mUseStillCameraForTimeLapse &&
+ mCamera != NULL) {
mCamera->releaseRecordingFrame(frame);
}
}