diff options
author | aurelien <aurelien@cwb.io> | 2013-09-23 10:33:22 +0200 |
---|---|---|
committer | aurelien <aurelien@cwb.io> | 2013-09-23 10:33:22 +0200 |
commit | 2735c9d273c54b555681f30f5c685998fed7b484 (patch) | |
tree | f8172dbea44d1c4751a99a62fb236a14c9d2dc20 /pcr/zoneminder/zoneminder-1.25.0-kernel35.patch | |
parent | d78a32a6ccb8663a62a093b54e947e2efc840fe0 (diff) | |
parent | 97f65e06566f3bb15bc7395624017b8e6ca0d043 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
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) ); + } |