Don't overwrite different stillshot fourCC in capture start

Change-Id: I910fe6d4d93ef89998e96a47c0d42b16f7d531d6

diff --git a/gst-libs/gst/camera/gstmfldcameracontroliface.c b/gst-libs/gst/camera/gstmfldcameracontroliface.c
index 7c8dfbf..bf0c11f 100644 (file)
--- a/gst-libs/gst/camera/gstmfldcameracontroliface.c
+++ b/gst-libs/gst/camera/gstmfldcameracontroliface.c
@@ -641,7 +641,6 @@ gst_camerasrc_camera_control_set_capture_command( GstCameraSrc* camerasrc,
     bclass->set_capture_mode (camerasrc, camerasrc->capture_mode);
     camerasrc->capture_fps_n = camerasrc->fps_n;
     camerasrc->capture_fps_d = camerasrc->fps_d;
-    camerasrc->capture_fourcc = camerasrc->current_fourcc;
 
     camerasrc->preview_fourcc = camerasrc->current_fourcc;
     camerasrc->preview_w = camerasrc->current_w;

diff --git a/packaging/mfldv4l2camsrc.changes b/packaging/mfldv4l2camsrc.changes
index c5ddd32..b168c17 100644 (file)
--- a/packaging/mfldv4l2camsrc.changes
+++ b/packaging/mfldv4l2camsrc.changes
@@ -1,3 +1,6 @@
+* Thu Nov 22 2012 Jussi Saavalainen <jussi.saavalainen@ixonos.com> accepted/trunk/20121112.215039@58b3c6d
+- Don't overwrite different stillshot fourCC in capture start
+
 * Tue Nov 20 2012 Timo <timo.toikkanen@ixonos.com> accepted/trunk/20121119.191102@de82248
 - Changed functions