21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp
|
|
--- ./src/zm_local_camera.cpp.kernel35 2012-07-16 15:01:22.182614878 -0500
|
|
+++ ./src/zm_local_camera.cpp 2012-07-16 15:02:16.491941730 -0500
|
|
@@ -740,7 +740,7 @@ void LocalCamera::Terminate()
|
|
{
|
|
Debug( 3, "Terminating video stream" );
|
|
//enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
|
- enum v4l2_buf_type type = v4l2_data.fmt.type;
|
|
+ enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
|
|
if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
|
|
Error( "Failed to stop capture stream: %s", strerror(errno) );
|
|
|
|
@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture()
|
|
|
|
Debug( 3, "Starting video stream" );
|
|
//enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
|
|
- enum v4l2_buf_type type = v4l2_data.fmt.type;
|
|
+ enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
|
|
if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
|
|
Fatal( "Failed to start capture stream: %s", strerror(errno) );
|
|
}
|