diff options
| -rw-r--r-- | v4l/ChangeLog | 12 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-eeprom.c | 3 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-encoder.c | 4 | ||||
| -rw-r--r-- | v4l_experimental/pvrusb2/pvrusb2-hdw.c | 3 |
4 files changed, 18 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index aa27e8c2e..94a097d21 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,15 @@ +2005-11-29 19:45 mchehab + + * ../v4l_experimental/pvrusb2/pvrusb2-eeprom.c: + * ../v4l_experimental/pvrusb2/pvrusb2-encoder.c: + (pvr2_encoder_configure): + * ../v4l_experimental/pvrusb2/pvrusb2-hdw.c: + (pvr2_hdw_commit_ctl_internal): + + - Fixed support for PAL-M. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-11-29 16:00 mkrufky * ../v4l/Makefile: diff --git a/v4l_experimental/pvrusb2/pvrusb2-eeprom.c b/v4l_experimental/pvrusb2/pvrusb2-eeprom.c index c7a8ec53b..07d1a239d 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-eeprom.c +++ b/v4l_experimental/pvrusb2/pvrusb2-eeprom.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-eeprom.c,v 1.2 2005/11/27 23:01:16 mcisely Exp $ + * $Id: pvrusb2-eeprom.c,v 1.3 2005/11/29 19:49:09 mchehab Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> @@ -368,6 +368,7 @@ static v4l2_std_id std_choices[] = { [PVR2_CVAL_VIDEOSTANDARD_PAL_I] = V4L2_STD_PAL_I, [PVR2_CVAL_VIDEOSTANDARD_PAL_DK] = V4L2_STD_PAL_DK, [PVR2_CVAL_VIDEOSTANDARD_SECAM_L] = V4L2_STD_SECAM_L, + [PVR2_CVAL_VIDEOSTANDARD_PAL_M] = V4L2_STD_PAL_M, }; void pvr2_eeprom_set_default_standard(struct pvr2_hdw *hdw) diff --git a/v4l_experimental/pvrusb2/pvrusb2-encoder.c b/v4l_experimental/pvrusb2/pvrusb2-encoder.c index e935eaead..293997b36 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-encoder.c +++ b/v4l_experimental/pvrusb2/pvrusb2-encoder.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-encoder.c,v 1.2 2005/11/29 14:10:44 mchehab Exp $ + * $Id: pvrusb2-encoder.c,v 1.3 2005/11/29 19:49:09 mchehab Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * Copyright (C) 2004 Aurelien Alleaume <slts@free.fr> @@ -470,7 +470,7 @@ int pvr2_encoder_configure(struct pvr2_hdw *hdw) (u32) (hdw->controls[PVR2_CID_PEAKVIDEOBITRATE].value) / 400); /* setup GOP structure (GOP size = 0f or 0c, 3-1 = 2 B-frames) */ ret |= pvr2_write_encoder_vcmd(hdw, IVTV_API_ASSIGN_GOP_PROPERTIES, 2, - is_ntsc ? 0x0f : 0x0c, 0x03); + is_30fps ? 0x0f : 0x0c, 0x03); /* enable 3:2 pulldown */ ret |= pvr2_write_encoder_vcmd(hdw,IVTV_API_ASSIGN_3_2_PULLDOWN,1,0); diff --git a/v4l_experimental/pvrusb2/pvrusb2-hdw.c b/v4l_experimental/pvrusb2/pvrusb2-hdw.c index 9231d71a2..4bcb30b22 100644 --- a/v4l_experimental/pvrusb2/pvrusb2-hdw.c +++ b/v4l_experimental/pvrusb2/pvrusb2-hdw.c @@ -1,6 +1,6 @@ /* * - * $Id: pvrusb2-hdw.c,v 1.3 2005/11/29 14:10:44 mchehab Exp $ + * $Id: pvrusb2-hdw.c,v 1.4 2005/11/29 19:49:09 mchehab Exp $ * * Copyright (C) 2005 Mike Isely <isely@pobox.com> * @@ -1441,6 +1441,7 @@ int pvr2_hdw_commit_ctl_internal(struct pvr2_hdw *hdw) int nvres = hdw->controls[PVR2_CID_VRES].value; switch (hdw->controls[PVR2_CID_VIDEOSTANDARD].value) { case PVR2_CVAL_VIDEOSTANDARD_NTSC_M: + case PVR2_CVAL_VIDEOSTANDARD_PAL_M: nvres = 480; break; default: |