diff options
| -rw-r--r-- | v4l/ChangeLog | 8 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-hdw.h | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index d3b26b09d..e2839d4bd 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-12-28 16:17 mcisely + + * v4l_experimental/pvrusb2/pvrusb2-hdw.h: + - Prioritize PAL_BG over SECAM_L when we have to choose. + + Signed-off-by: Mike Isely <isely@pobox.com> + Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> + 2005-12-28 14:55 hverkuil * linux/drivers/media/video/tea5767.c: (tea5767_signal): diff --git a/v4l_experimental/pvrusb2/pvrusb2-hdw.h b/v4l_experimental/pvrusb2/pvrusb2-hdw.h index 4b3943f57..eaa15c22a 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-hdw.h +++ b/v4l_experimental/pvrusb2/pvrusb2-hdw.h @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-hdw.h,v 1.2 2005/11/29 14:10:44 mchehab Exp $ + * $Id: pvrusb2-hdw.h,v 1.3 2005/12/28 16:22:33 mcisely Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * @@ -96,14 +96,14 @@ /* Legal values for the VIDEOSTANDARD state variable */ #define PVR2_CVAL_VIDEOSTANDARD_NTSC_M 0 -#define PVR2_CVAL_VIDEOSTANDARD_SECAM_L 1 -#define PVR2_CVAL_VIDEOSTANDARD_PAL_BG 2 -#define PVR2_CVAL_VIDEOSTANDARD_PAL_I 3 -#define PVR2_CVAL_VIDEOSTANDARD_PAL_DK 4 -#define PVR2_CVAL_VIDEOSTANDARD_PAL_M 5 +#define PVR2_CVAL_VIDEOSTANDARD_PAL_BG 1 +#define PVR2_CVAL_VIDEOSTANDARD_PAL_I 2 +#define PVR2_CVAL_VIDEOSTANDARD_PAL_DK 3 +#define PVR2_CVAL_VIDEOSTANDARD_PAL_M 4 +#define PVR2_CVAL_VIDEOSTANDARD_SECAM_L 5 #define PVR2_CVAL_VIDEOSTANDARD_MIN PVR2_CVAL_VIDEOSTANDARD_NTSC_M -#define PVR2_CVAL_VIDEOSTANDARD_MAX PVR2_CVAL_VIDEOSTANDARD_PAL_M +#define PVR2_CVAL_VIDEOSTANDARD_MAX PVR2_CVAL_VIDEOSTANDARD_SECAM_L /* Legal values for the INPUT state variable */ #define PVR2_CVAL_INPUT_TV 0 |