From a6024c4efa3dedfc191bc62f1333f4a01de8f583 Mon Sep 17 00:00:00 2001 From: ToadKing Date: Sat, 9 Nov 2013 23:06:58 -0500 Subject: [PATCH] add width and height retrieval to camera driver --- camera/video4linux2.c | 2 +- driver.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camera/video4linux2.c b/camera/video4linux2.c index 2d4e2c86d9..54c2b6f0ee 100644 --- a/camera/video4linux2.c +++ b/camera/video4linux2.c @@ -750,7 +750,7 @@ static void v4l_texture_subimage_2d(void *data) preprocess_image(data); } -static int v4l_ready(void *data) +static int v4l_ready(void *data, unsigned *width, unsigned *height) { video4linux_t *v4l = (video4linux_t*)data; return v4l->ready; diff --git a/driver.h b/driver.h index 688e5f422b..0d2cb11a54 100644 --- a/driver.h +++ b/driver.h @@ -339,7 +339,7 @@ typedef struct camera_driver void (*free)(void *data); int (*start)(void *data); int (*stop)(void *data); - int (*ready)(void *data); + int (*ready)(void *data, unsigned *width, unsigned *height); void (*texture_image_2d)(void *data); void (*texture_subimage_2d)(void *data); const char *ident;