From c35d0cdd0f4dd3c5b0a554b8636033d6ed528aba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Thu, 13 Jan 2011 05:27:37 -0300 Subject: [PATCH] --- yaml --- r: 232209 b: refs/heads/master c: ded5e903b75a9e2a9349e19063e3b2a63b05e828 h: refs/heads/master i: 232207: 35ca21ca51ab158b4403c40876cc79ce4b0cb56d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/jpeg.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0206ea8537d1..c63ed8f7a937 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95c967c167785eb991cf6b22fb854dd8d61d0ff8 +refs/heads/master: ded5e903b75a9e2a9349e19063e3b2a63b05e828 diff --git a/trunk/drivers/media/video/gspca/jpeg.h b/trunk/drivers/media/video/gspca/jpeg.h index de63c36806c0..ab54910418b4 100644 --- a/trunk/drivers/media/video/gspca/jpeg.h +++ b/trunk/drivers/media/video/gspca/jpeg.h @@ -141,9 +141,9 @@ static void jpeg_define(u8 *jpeg_hdr, memcpy(jpeg_hdr, jpeg_head, sizeof jpeg_head); #ifndef CONEX_CAM jpeg_hdr[JPEG_HEIGHT_OFFSET + 0] = height >> 8; - jpeg_hdr[JPEG_HEIGHT_OFFSET + 1] = height & 0xff; + jpeg_hdr[JPEG_HEIGHT_OFFSET + 1] = height; jpeg_hdr[JPEG_HEIGHT_OFFSET + 2] = width >> 8; - jpeg_hdr[JPEG_HEIGHT_OFFSET + 3] = width & 0xff; + jpeg_hdr[JPEG_HEIGHT_OFFSET + 3] = width; jpeg_hdr[JPEG_HEIGHT_OFFSET + 6] = samplesY; #endif }