diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-01-08 11:29:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-16 11:07:29 -0200 |
| commit | 56ae24aad8f9e25dfef995c3e898e5f394cf0beb (patch) | |
| tree | 2ac5f9df9453057eef01f577647101101fae08d1 /drivers/media/video/pwc/pwc.h | |
| parent | 54d3fb3b11a7c38b112585e54b7af7cb3faa5c91 (diff) | |
| download | op-kernel-dev-56ae24aad8f9e25dfef995c3e898e5f394cf0beb.zip op-kernel-dev-56ae24aad8f9e25dfef995c3e898e5f394cf0beb.tar.gz | |
[media] pwc: Make decoder data part of the main pwc struct
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc/pwc.h')
| -rw-r--r-- | drivers/media/video/pwc/pwc.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index 47c518f..0f3bc1b 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h @@ -44,6 +44,8 @@ #ifdef CONFIG_USB_PWC_INPUT_EVDEV #include <linux/input.h> #endif +#include "pwc-dec1.h" +#include "pwc-dec23.h" /* Version block */ #define PWC_VERSION "10.0.15" @@ -272,7 +274,10 @@ struct pwc_device int frame_total_size; /* including header & trailer */ int drop_frames; - void *decompress_data; /* private data for decompression engine */ + union { /* private data for decompression engine */ + struct pwc_dec1_private dec1; + struct pwc_dec23_private dec23; + }; /* * We have an 'image' and a 'view', where 'image' is the fixed-size img |
