diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-22 23:03:46 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-10-22 23:03:46 -0200 |
| commit | 93643331275b8ef2c4070077f260a52431133713 (patch) | |
| tree | 0bd0a600fdbb3aeb6954c05bed9103101ad9d4b0 /pcr/zoneminder/zoneminder-1.25.0-kernel35.patch | |
| parent | 10970cba29cb1f265bcd7045a693e50ac6bf24b0 (diff) | |
| parent | 72780d31ec566cbd62df57a6ba4d8fc7bc90bf56 (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, 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) ); - } |