diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-05 08:29:12 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-03-05 08:29:12 -0300 |
| commit | d71a6b97b8a2bbff273098c4804786efb2f8b15e (patch) | |
| tree | a0c15869b6ca373f25e78fe25718519fed629bc5 /contrib | |
| parent | a236c4cf30bcc3de37b98924df22df2598995408 (diff) | |
Sync with latest Kernel version
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/freebsd/include/linux/videodev2.h | 3 | ||||
| -rw-r--r-- | contrib/test/mc_nextgen_test.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/contrib/freebsd/include/linux/videodev2.h b/contrib/freebsd/include/linux/videodev2.h index d884ef3a..b42b5de1 100644 --- a/contrib/freebsd/include/linux/videodev2.h +++ b/contrib/freebsd/include/linux/videodev2.h @@ -657,6 +657,9 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_JPGL v4l2_fourcc('J', 'P', 'G', 'L') /* JPEG-Lite */ #define V4L2_PIX_FMT_SE401 v4l2_fourcc('S', '4', '0', '1') /* se401 janggu compressed rgb */ #define V4L2_PIX_FMT_S5C_UYVY_JPG v4l2_fourcc('S', '5', 'C', 'I') /* S5C73M3 interleaved UYVY/JPEG */ +#define V4L2_PIX_FMT_Y8I v4l2_fourcc('Y', '8', 'I', ' ') /* Greyscale 8-bit L/R interleaved */ +#define V4L2_PIX_FMT_Y12I v4l2_fourcc('Y', '1', '2', 'I') /* Greyscale 12-bit L/R interleaved */ +#define V4L2_PIX_FMT_Z16 v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */ /* SDR formats - used only for Software Defined Radio devices */ #define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */ diff --git a/contrib/test/mc_nextgen_test.c b/contrib/test/mc_nextgen_test.c index 5ead8e0b..353d7bb8 100644 --- a/contrib/test/mc_nextgen_test.c +++ b/contrib/test/mc_nextgen_test.c @@ -68,6 +68,12 @@ static int show_dot = 0; static int max_tsout = 5; static char media_device[256] = "/dev/media0"; + +static inline void *media_get_uptr(__u64 arg) +{ + return (void *)(uintptr_t)arg; +} + static error_t parse_opt(int k, char *arg, struct argp_state *state) { switch (k) { |