diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-03-09 17:10:03 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-03-09 17:10:03 +0100 |
| commit | 8a9152967f3467949c4a6ec02ef9623be9f396fb (patch) | |
| tree | 1306e01d4065ff5904d03abeceaf9ce57dd28314 /linux/drivers/media/video/cx25840/cx25840-vbi.c | |
| parent | c1855a4044f8e28d4de4e9d942d19223ab2d5048 (diff) | |
| download | mediapointer-dvb-s2-8a9152967f3467949c4a6ec02ef9623be9f396fb.tar.gz mediapointer-dvb-s2-8a9152967f3467949c4a6ec02ef9623be9f396fb.tar.bz2 | |
cx25840: better PAL-M and NTSC-KR handling
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx25840/cx25840-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-vbi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-vbi.c b/linux/drivers/media/video/cx25840/cx25840-vbi.c index f8fe2c6ef..2d8364e65 100644 --- a/linux/drivers/media/video/cx25840/cx25840-vbi.c +++ b/linux/drivers/media/video/cx25840/cx25840-vbi.c @@ -86,7 +86,7 @@ static int decode_vps(u8 * dst, u8 * p) void cx25840_vbi_setup(struct i2c_client *client) { struct cx25840_state *state = i2c_get_clientdata(client); - v4l2_std_id std = cx25840_get_v4lstd(client); + v4l2_std_id std = state->std; int hblank,hactive,burst,vblank,vactive,sc,vblank656,src_decimation; int luma_lpf,uv_lpf, comb; u32 pll_int,pll_frac,pll_post; @@ -243,7 +243,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg) 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */ 0, 0, 0, 0 }; - int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60); + int is_pal = !(state->std & V4L2_STD_525_60); int i; fmt = arg; @@ -280,7 +280,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg) case VIDIOC_S_FMT: { - int is_pal = !(cx25840_get_v4lstd(client) & V4L2_STD_525_60); + int is_pal = !(state->std & V4L2_STD_525_60); int vbi_offset = is_pal ? 1 : 0; int i, x; u8 lcr[24]; |