summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-16 11:30:29 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-16 11:30:29 -0300
commit1eb5c90687e833327fe2607cb1350221b335f34a (patch)
tree6b1d6bdb07f81a01345e3e0f6be2a7bce595657d /linux/drivers/media/video
parent4fbc3a9b2c08a6c1324b155beefdc526bf5412fa (diff)
downloadmediapointer-dvb-s2-1eb5c90687e833327fe2607cb1350221b335f34a.tar.gz
mediapointer-dvb-s2-1eb5c90687e833327fe2607cb1350221b335f34a.tar.bz2
zoran: v4l2_jpegcompression is being redefined inside zoran.h
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/zoran.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/linux/drivers/media/video/zoran.h b/linux/drivers/media/video/zoran.h
index 8e2784baa..5f74688c1 100644
--- a/linux/drivers/media/video/zoran.h
+++ b/linux/drivers/media/video/zoran.h
@@ -269,17 +269,6 @@ struct zoran_v4l_settings {
const struct zoran_format *format; /* capture format */
};
-struct v4l2_jpegcompression {
- int quality;
- int APPn;
- int APP_len;
- char APP_data[60];
- int COM_len;
- char COM_data[60];
- __u32 jpeg_markers;
- __u8 reserved[116];
-};
-
/* jpg-capture/-playback settings */
struct zoran_jpg_settings {
int decimation; /* this bit is used to set everything to default */