diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-27 14:09:24 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-27 14:09:24 -0200 |
| commit | 07c40dde6fd84df8218fed6351fe81f77458406e (patch) | |
| tree | 2d8046452992b6b68b5c6d067ee6ca4a690b39b7 /linux/drivers/media/video/zoran_device.c | |
| parent | 0b14b001f4b716b7d53a1413de30bbdb70764651 (diff) | |
| parent | 56ab5d5a038d60cd901d04a60c56f4a9e0631c00 (diff) | |
| download | mediapointer-dvb-s2-07c40dde6fd84df8218fed6351fe81f77458406e.tar.gz mediapointer-dvb-s2-07c40dde6fd84df8218fed6351fe81f77458406e.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/v4l
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/zoran_device.c')
| -rw-r--r-- | linux/drivers/media/video/zoran_device.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/zoran_device.c b/linux/drivers/media/video/zoran_device.c index f7f8e78ec..b7f62ee8a 100644 --- a/linux/drivers/media/video/zoran_device.c +++ b/linux/drivers/media/video/zoran_device.c @@ -61,7 +61,8 @@ extern const struct zoran_format zoran_formats[]; -static int lml33dpath = 0; /* 1 will use digital path in capture +static int lml33dpath; /* default = 0 + * 1 will use digital path in capture * mode instead of analog. It can be * used for picture adjustments using * tool like xawtv while watching image @@ -988,7 +989,7 @@ void zr36057_enable_jpg (struct zoran *zr, enum zoran_codec_mode mode) { - static int zero = 0; + static int zero; static int one = 1; struct vfe_settings cap; int field_size = |