diff options
author | audetto@tiscali.it <audetto@tiscali.it> | 2006-12-12 08:35:57 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-27 11:18:50 -0500 |
commit | 2485eb0a553f2ac8c73267ce48fcdee8a9728d43 (patch) | |
tree | b8f042aff5add599d0359ac58e7ae198cd00637a /drivers/media/video/w9966.c | |
parent | c6268461473e1c62e31afde657069c050ee8dea7 (diff) |
V4L/DVB (4964): VIDEO_PALETTE_YUYV and VIDEO_PALETTE_YUV422 are the same palette
Consistent handling of VIDEO_PALETTE_YUYV and VIDEO_PALETTE_YUV422
Signed-off-by: Andrea A Odetti <audetto@tiscali.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/w9966.c')
-rw-r--r-- | drivers/media/video/w9966.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index 4bdc886abc4c..8d14f308f171 100644 --- a/drivers/media/video/w9966.c +++ b/drivers/media/video/w9966.c | |||
@@ -789,7 +789,7 @@ static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file, | |||
789 | case VIDIOCSPICT: | 789 | case VIDIOCSPICT: |
790 | { | 790 | { |
791 | struct video_picture *vpic = arg; | 791 | struct video_picture *vpic = arg; |
792 | if (vpic->depth != 16 || vpic->palette != VIDEO_PALETTE_YUV422) | 792 | if (vpic->depth != 16 || (vpic->palette != VIDEO_PALETTE_YUV422 && vpic->palette != VIDEO_PALETTE_YUYV)) |
793 | return -EINVAL; | 793 | return -EINVAL; |
794 | 794 | ||
795 | cam->brightness = vpic->brightness >> 8; | 795 | cam->brightness = vpic->brightness >> 8; |