summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-02-11 08:46:32 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-02-11 09:24:53 -0200
commitf344cb78efc3d3bf80a74862111fcd352076201c (patch)
treeb0fa595f821947dd2a1db0d3f830ccf7f7f245e8
parent436829a9d661815683f29df16a6843aa2e6066df (diff)
Use the fourcc header instead of redefining it inside the code
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--src/v4l.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/v4l.c b/src/v4l.c
index 605454b..a51f00f 100644
--- a/src/v4l.c
+++ b/src/v4l.c
@@ -32,6 +32,7 @@
#include "regionstr.h"
#include "dgaproc.h"
#include "xf86str.h"
+#include "fourcc.h"
#include <asm/ioctl.h> /* _IORW(xxx) #defines are here */
@@ -346,19 +347,6 @@ static void AddAllV4LControls(PortPrivPtr p, XF86AttributeRec **list,
/* ---------------------------------------------------------------------- */
-/*
- * From: hw/xfree86/common/fourcc.h
- *
- * FIXME: Are they the same codes as the V4L fourcc? It would be better
- * to include a header with them.
- */
-#define FOURCC_YUY2 0x32595559
-#define FOURCC_YV12 0x32315659
-#define FOURCC_I420 0x30323449
-#define FOURCC_UYVY 0x59565955
-#define FOURCC_IA44 0x34344149
-#define FOURCC_AI44 0x34344941
-
/* setup yuv overlay + hw scaling: look if we find some common video
format which both v4l driver and the X-Server can handle */
static void v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv,