diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-22 00:06:13 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-10-22 00:06:13 -0400 |
| commit | dc831bb9d74e073e3e95d8ce8d0715edd7eee1b0 (patch) | |
| tree | 594c45c42823ba6043ca959227cf96a20e916988 /pcr/zoneminder/zoneminder-1.25.0-kernel35.patch | |
| parent | dfb2fcdea0928d362f80caf0a5181c9851bffad9 (diff) | |
| parent | dc0e4891b14c9112d374bad83ec5d21a55db57e2 (diff) | |
| download | abslibre-dc831bb9d74e073e3e95d8ce8d0715edd7eee1b0.tar.gz abslibre-dc831bb9d74e073e3e95d8ce8d0715edd7eee1b0.tar.bz2 abslibre-dc831bb9d74e073e3e95d8ce8d0715edd7eee1b0.zip | |
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, 0 insertions, 21 deletions
diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch deleted file mode 100644 index 9939dc5c3..000000000 --- a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 -@@ -739,7 +739,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) ); - -@@ -1519,7 +1519,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) ); - } |