diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 00:37:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-16 00:37:36 -0300 |
| commit | 52f9a4e5b2eae78dceb70971ee7df8e1db330239 (patch) | |
| tree | 56a3b69004fa80da2a2d9afb6498b79db9fea434 /linux/include | |
| parent | 6e323483b126ac7589cadb5bad2f666cf4b7eb9d (diff) | |
| parent | a2aa04e72cd03545056bd4a9a7cdd6b340908ca2 (diff) | |
| download | mediapointer-dvb-s2-52f9a4e5b2eae78dceb70971ee7df8e1db330239.tar.gz mediapointer-dvb-s2-52f9a4e5b2eae78dceb70971ee7df8e1db330239.tar.bz2 | |
merge: http://kernellabs.com/hg/~dheitmueller/em28xx-no-audio
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 3 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 82f9e723e..a018bb458 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -347,7 +347,8 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */ #define V4L2_PIX_FMT_SQ905C v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */ #define V4L2_PIX_FMT_PJPG v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */ -#define V4L2_PIX_FMT_YVYU v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */ +#define V4L2_PIX_FMT_YVYU v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */ +#define V4L2_PIX_FMT_OV518 v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */ /* * F O R M A T E N U M E R A T I O N diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 735a2a941..cbf97f45f 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -125,6 +125,7 @@ #define TUNER_TCL_MF02GIP_5N 77 /* TCL MF02GIP_5N */ #define TUNER_PHILIPS_FMD1216MEX_MK3 78 #define TUNER_PHILIPS_FM1216MK5 79 +#define TUNER_PHILIPS_FQ1216LME_MK3 80 /* Active loopthrough, no FM */ /* tv card specific */ #define TDA9887_PRESENT (1<<0) |