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/zoran_device.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/zoran_device.c')
-rw-r--r-- | drivers/media/video/zoran_device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c index 168e431d7c7..b0752767ee4 100644 --- a/drivers/media/video/zoran_device.c +++ b/drivers/media/video/zoran_device.c | |||
@@ -429,7 +429,7 @@ zr36057_set_vfe (struct zoran *zr, | |||
429 | reg |= (HorDcm << ZR36057_VFESPFR_HorDcm); | 429 | reg |= (HorDcm << ZR36057_VFESPFR_HorDcm); |
430 | reg |= (VerDcm << ZR36057_VFESPFR_VerDcm); | 430 | reg |= (VerDcm << ZR36057_VFESPFR_VerDcm); |
431 | reg |= (DispMode << ZR36057_VFESPFR_DispMode); | 431 | reg |= (DispMode << ZR36057_VFESPFR_DispMode); |
432 | if (format->palette != VIDEO_PALETTE_YUV422) | 432 | if (format->palette != VIDEO_PALETTE_YUV422 && format->palette != VIDEO_PALETTE_YUYV) |
433 | reg |= ZR36057_VFESPFR_LittleEndian; | 433 | reg |= ZR36057_VFESPFR_LittleEndian; |
434 | /* RJ: I don't know, why the following has to be the opposite | 434 | /* RJ: I don't know, why the following has to be the opposite |
435 | * of the corresponding ZR36060 setting, but only this way | 435 | * of the corresponding ZR36060 setting, but only this way |
@@ -441,6 +441,7 @@ zr36057_set_vfe (struct zoran *zr, | |||
441 | reg |= ZR36057_VFESPFR_TopField; | 441 | reg |= ZR36057_VFESPFR_TopField; |
442 | switch (format->palette) { | 442 | switch (format->palette) { |
443 | 443 | ||
444 | case VIDEO_PALETTE_YUYV: | ||
444 | case VIDEO_PALETTE_YUV422: | 445 | case VIDEO_PALETTE_YUV422: |
445 | reg |= ZR36057_VFESPFR_YUV422; | 446 | reg |= ZR36057_VFESPFR_YUV422; |
446 | break; | 447 | break; |