diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-09-30 03:35:32 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2012-09-30 03:35:32 -0300 |
| commit | e19febc1b06e3578b3285e9eb7dcd25ebe50bfdc (patch) | |
| tree | 34baeaf4fee986ecc701b8ae7797f67926510f9e /pcr/zoneminder/zoneminder-1.25.0-kernel35.patch | |
| parent | edee29afbe8b759475bef14a355b56c0f84b80fb (diff) | |
| parent | 28e2d654f0e7faad39dd9365e782901eb608246c (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch index 51bc1288d..9939dc5c3 100644 --- a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch +++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch @@ -1,7 +1,7 @@ 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() +@@ -739,7 +739,7 @@ void LocalCamera::Terminate() { Debug( 3, "Terminating video stream" ); //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; @@ -10,7 +10,7 @@ diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 ) Error( "Failed to stop capture stream: %s", strerror(errno) ); -@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture() +@@ -1519,7 +1519,7 @@ int LocalCamera::PrimeCapture() Debug( 3, "Starting video stream" ); //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; |