diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-06 22:04:31 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-06 22:04:31 -0600 |
| commit | 2967b22c6179ded9cc01496e10dcb0f292d0c182 (patch) | |
| tree | 9219e7dc564f3dc8af29ea142c4b5d409ea74310 /pcr/zoneminder/zoneminder-1.25.0-kernel35.patch | |
| parent | 55677d14e4829d6a7859333d3560db346c228fdf (diff) | |
| parent | e84010fb9a6f81d96d9c54661a7abde97a0eb187 (diff) | |
| download | abslibre-2967b22c6179ded9cc01496e10dcb0f292d0c182.tar.gz abslibre-2967b22c6179ded9cc01496e10dcb0f292d0c182.tar.bz2 abslibre-2967b22c6179ded9cc01496e10dcb0f292d0c182.zip | |
Merge branch 'master-remote' into master-undelete
Diffstat (limited to 'pcr/zoneminder/zoneminder-1.25.0-kernel35.patch')
| -rw-r--r-- | pcr/zoneminder/zoneminder-1.25.0-kernel35.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch new file mode 100644 index 000000000..51bc1288d --- /dev/null +++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch @@ -0,0 +1,21 @@ +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) ); + } |