diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/media/video/samsung/mfc5x/mfc_inst.h | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/media/video/samsung/mfc5x/mfc_inst.h')
-rw-r--r-- | drivers/media/video/samsung/mfc5x/mfc_inst.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/video/samsung/mfc5x/mfc_inst.h b/drivers/media/video/samsung/mfc5x/mfc_inst.h index e297c55..b78dd91 100644 --- a/drivers/media/video/samsung/mfc5x/mfc_inst.h +++ b/drivers/media/video/samsung/mfc5x/mfc_inst.h @@ -15,6 +15,9 @@ #define __MFC_INST_H __FILE__ #include <linux/list.h> +#ifdef CONFIG_SLP +#include <linux/videodev2.h> +#endif #include "mfc.h" #include "mfc_interface.h" @@ -130,7 +133,7 @@ struct mfc_inst_ctx { unsigned int width; unsigned int height; volatile unsigned char *shm; - unsigned int shmofs; + long shmofs; unsigned int ctxbufofs; unsigned int ctxbufsize; unsigned int descbufofs; /* FIXME: move to decoder context */ @@ -170,6 +173,10 @@ struct mfc_inst_ctx { #if SUPPORT_SLICE_ENCODING int slice_flag; #endif +#ifdef CONFIG_SLP + struct vb2_plane *enc_planes[VIDEO_MAX_PLANES]; + struct vb2_plane *dec_planes[VIDEO_MAX_PLANES]; +#endif }; struct mfc_inst_ctx *mfc_create_inst(void); |