git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create branch 'vserver'.
[linux-2.6.git]
/
drivers
/
media
/
video
/
zr36060.h
diff --git
a/drivers/media/video/zr36060.h
b/drivers/media/video/zr36060.h
index
e64540b
..
914ffa4
100644
(file)
--- a/
drivers/media/video/zr36060.h
+++ b/
drivers/media/video/zr36060.h
@@
-27,6
+27,8
@@
#ifndef ZR36060_H
#define ZR36060_H
#ifndef ZR36060_H
#define ZR36060_H
+#include "videocodec.h"
+
/* data stored for each zoran jpeg codec chip */
struct zr36060 {
char name[32];
/* data stored for each zoran jpeg codec chip */
struct zr36060 {
char name[32];
@@
-51,6
+53,10
@@
struct zr36060 {
__u8 v_samp_ratio[8];
__u16 scalefact;
__u16 dri;
__u8 v_samp_ratio[8];
__u16 scalefact;
__u16 dri;
+
+ /* app/com marker data */
+ struct jpeg_app_marker app;
+ struct jpeg_com_marker com;
};
/* ZR36060 register addresses */
};
/* ZR36060 register addresses */