mirror of
https://git.freebsd.org/ports.git
synced 2025-06-14 17:20:29 -04:00
d764059958
Renaming didn't help to unblock 3.x progress as co-existence with 2.x was no less complex than simply fixing consumers. This commit also restores directory-level history accidentally lost via git-svn. PR: 210505 Pointy hat to: jbeich (should've discussed first)
19 lines
593 B
C++
19 lines
593 B
C++
--- ./modules/highgui/src/cap_libv4l.cpp.orig 2013-07-10 07:49:00.000000000 -0400
|
|
+++ ./modules/highgui/src/cap_libv4l.cpp 2013-10-23 23:52:32.000000000 -0400
|
|
@@ -237,7 +237,6 @@
|
|
#include <sys/mman.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
-#include <asm/types.h> /* for videodev2.h */
|
|
#include <assert.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/ioctl.h>
|
|
@@ -574,7 +573,7 @@
|
|
|
|
static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) {
|
|
|
|
- __u32 ctrl_id;
|
|
+ uint32_t ctrl_id;
|
|
struct v4l2_control c;
|
|
if (capture->v4l2_ctrl_ranges != NULL) {
|
|
v4l2_free_ranges(capture);
|