diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-17 19:12:23 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-17 19:12:23 +0000 |
| commit | 99ea2d7ae5187063bbd57b237d40e5afea467db7 (patch) | |
| tree | 1d50ffd25e0850f992c2c2347d1643e4b0079431 | |
| parent | 4ba21606eeb7be186cf30b75ee8c4f3bc8163e10 (diff) | |
| download | mediapointer-dvb-s2-99ea2d7ae5187063bbd57b237d40e5afea467db7.tar.gz mediapointer-dvb-s2-99ea2d7ae5187063bbd57b237d40e5afea467db7.tar.bz2 | |
Fixed compiling with gcc 2.9x
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 26 | ||||
| -rw-r--r-- | v4l/ChangeLog | 7 |
2 files changed, 16 insertions, 17 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 01b0d601e..eb9a46747 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.81 2005/12/14 22:05:02 hverkuil Exp $ + $Id: bttv-driver.c,v 1.82 2005/12/17 19:12:23 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -226,8 +226,7 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .sram = 0, /* ITU-R frame line number of the first VBI line we can capture, of the first and second field. */ - .vbistart[0] = 7, - .vbistart[1] = 320, + .vbistart = { 7,320 }, },{ .v4l2_id = V4L2_STD_NTSC_M, .name = "NTSC", @@ -244,8 +243,7 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x1a, .vbipack = 144, .sram = 1, - .vbistart[0] = 10, - .vbistart[1] = 273, + .vbistart = { 10, 273 }, },{ .v4l2_id = V4L2_STD_SECAM, .name = "SECAM", @@ -262,8 +260,7 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x20, .vbipack = 255, .sram = 0, /* like PAL, correct? */ - .vbistart[0] = 7, - .vbistart[1] = 320, + .vbistart = { 7, 320 }, },{ .v4l2_id = V4L2_STD_PAL_Nc, .name = "PAL-Nc", @@ -280,8 +277,7 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x1a, .vbipack = 144, .sram = -1, - .vbistart[0] = 7, - .vbistart[1] = 320, + .vbistart = { 7, 320 }, },{ .v4l2_id = V4L2_STD_PAL_M, .name = "PAL-M", @@ -298,8 +294,7 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x1a, .vbipack = 144, .sram = -1, - .vbistart[0] = 10, - .vbistart[1] = 273, + .vbistart = { 10, 273 }, },{ .v4l2_id = V4L2_STD_PAL_N, .name = "PAL-N", @@ -316,8 +311,7 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x20, .vbipack = 144, .sram = -1, - .vbistart[0] = 7, - .vbistart[1] = 320, + .vbistart = { 7, 320}, },{ .v4l2_id = V4L2_STD_NTSC_M_JP, .name = "NTSC-JP", @@ -334,8 +328,7 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vdelay = 0x16, .vbipack = 144, .sram = -1, - .vbistart[0] = 10, - .vbistart[1] = 273, + .vbistart = {10, 273}, },{ /* that one hopefully works with the strange timing * which video recorders produce when playing a NTSC @@ -356,8 +349,7 @@ const struct bttv_tvnorm bttv_tvnorms[] = { .vbipack = 255, .vtotal = 524, .sram = -1, - .vbistart[0] = 10, - .vbistart[1] = 273, + .vbistart = { 10, 273 }, } }; static const unsigned int BTTV_TVNORMS = ARRAY_SIZE(bttv_tvnorms); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 8a267536b..2fd09a352 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-12-17 19:11 mchehab + + * linux/drivers/media/video/bttv-driver.c: + - Fixed compiling with gcc 2.9x + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-16 04:12 mkrufky * v4l/Makefile: |