Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 241887
b: refs/heads/master
c: 6899a9c
h: refs/heads/master
i:
  241885: 0926f57
  241883: 30387b4
  241879: 8f05d50
  241871: 13ee33f
  241855: d1566f4
v: v3
  • Loading branch information
Hans de Goede authored and Mauro Carvalho Chehab committed Mar 21, 2011
1 parent 2d7e51c commit accb264
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b39e0cb9018bf95348078ad74b3e0171e985389a
refs/heads/master: 6899a9c7778a6d19edc74e2ef7dfb6daf21dc366
8 changes: 4 additions & 4 deletions trunk/drivers/media/video/gspca/sn9c20x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ static const struct v4l2_pix_format vga_mode[] = {
.priv = SCALE_160x120},
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
.sizeimage = 320 * 240 * 4 / 8 + 590,
.colorspace = V4L2_COLORSPACE_JPEG,
.priv = SCALE_320x240 | MODE_JPEG},
{320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
Expand All @@ -384,7 +384,7 @@ static const struct v4l2_pix_format vga_mode[] = {
.priv = SCALE_320x240},
{640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 640,
.sizeimage = 640 * 480 * 3 / 8 + 590,
.sizeimage = 640 * 480 * 4 / 8 + 590,
.colorspace = V4L2_COLORSPACE_JPEG,
.priv = SCALE_640x480 | MODE_JPEG},
{640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
Expand Down Expand Up @@ -417,7 +417,7 @@ static const struct v4l2_pix_format sxga_mode[] = {
.priv = SCALE_160x120},
{320, 240, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 320,
.sizeimage = 320 * 240 * 3 / 8 + 590,
.sizeimage = 320 * 240 * 4 / 8 + 590,
.colorspace = V4L2_COLORSPACE_JPEG,
.priv = SCALE_320x240 | MODE_JPEG},
{320, 240, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
Expand All @@ -432,7 +432,7 @@ static const struct v4l2_pix_format sxga_mode[] = {
.priv = SCALE_320x240},
{640, 480, V4L2_PIX_FMT_JPEG, V4L2_FIELD_NONE,
.bytesperline = 640,
.sizeimage = 640 * 480 * 3 / 8 + 590,
.sizeimage = 640 * 480 * 4 / 8 + 590,
.colorspace = V4L2_COLORSPACE_JPEG,
.priv = SCALE_640x480 | MODE_JPEG},
{640, 480, V4L2_PIX_FMT_SBGGR8, V4L2_FIELD_NONE,
Expand Down

0 comments on commit accb264

Please sign in to comment.