aboutsummaryrefslogtreecommitdiffstats
path: root/console
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:39 (GMT)
committerGerd Hoffmann <kraxel@redhat.com>2010-04-01 09:24:39 (GMT)
commit4717c404e22922a13f54e431fbf683309870513f (patch)
tree2701ab85d1bdb0ab7c6315a38657189b80f7ded2 /console
parent923e3c2dfcfef0d6a31239aceb7654ed3a49a7c4 (diff)
v3.78
Diffstat (limited to 'console')
-rw-r--r--console/v4l-conf.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/console/v4l-conf.c b/console/v4l-conf.c
index 2801da2..c99abf8 100644
--- a/console/v4l-conf.c
+++ b/console/v4l-conf.c
@@ -16,12 +16,12 @@
#include <string.h>
#include <errno.h>
#include <fcntl.h>
+#include <time.h>
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <linux/vt.h>
#include <linux/fb.h>
-#include <linux/videodev.h>
#ifdef HAVE_GETOPT_H
# include <getopt.h>
#endif
@@ -34,10 +34,8 @@
# endif
#endif
-#ifndef VIDIOC_QUERYCAP
-/* v4l2 not in kernel's videodev.h */
-# include "videodev2.h"
-#endif
+#include "videodev.h"
+#include "videodev2.h"
struct DISPLAYINFO {
int width; /* visible display width (pixels) */
@@ -340,7 +338,7 @@ displayinfo_v4l2(int fd, struct DISPLAYINFO *d)
/* set values */
fb.fmt.width = d->width;
fb.fmt.height = d->height;
- switch (d->bpp) {
+ switch (d->depth) {
case 8: fb.fmt.pixelformat = V4L2_PIX_FMT_HI240; break;
#if BYTE_ORDER == BIG_ENDIAN
case 15: fb.fmt.pixelformat = V4L2_PIX_FMT_RGB555X; break;

Privacy Policy