summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-driver.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 21:04:48 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-22 21:04:48 -0200
commit2a81a59d7d85fc2656c9cab0e56c9f819e2dc19e (patch)
tree9af686d50b122b3eb040ec07cd88d67c2776bed2 /linux/drivers/media/video/ivtv/ivtv-driver.h
parent8031abacbe51fa4062ff4bf1a34751b6a39460eb (diff)
parent7a8fd78dab48f8bf00654b303fb9bc86e4fa28b9 (diff)
downloadmediapointer-dvb-s2-2a81a59d7d85fc2656c9cab0e56c9f819e2dc19e.tar.gz
mediapointer-dvb-s2-2a81a59d7d85fc2656c9cab0e56c9f819e2dc19e.tar.bz2
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-driver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h
index 51f6e54ba..03df1cb7d 100644
--- a/linux/drivers/media/video/ivtv/ivtv-driver.h
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.h
@@ -697,7 +697,7 @@ struct ivtv {
u64 vbi_data_inserted; /* number of VBI bytes inserted into the MPEG stream */
u32 last_dec_timing[3]; /* cache last retrieved pts/scr/frame values */
unsigned long dualwatch_jiffies;/* jiffies value of the previous dualwatch check */
- u16 dualwatch_stereo_mode; /* current detected dualwatch stereo mode */
+ u32 dualwatch_stereo_mode; /* current detected dualwatch stereo mode */
/* VBI state info */