git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[pandora-kernel.git]
/
drivers
/
media
/
video
/
v4l1-compat.c
diff --git
a/drivers/media/video/v4l1-compat.c
b/drivers/media/video/v4l1-compat.c
index
474a29b
..
d7c3fcb
100644
(file)
--- a/
drivers/media/video/v4l1-compat.c
+++ b/
drivers/media/video/v4l1-compat.c
@@
-16,7
+16,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/module.h>
@@
-32,6
+31,7
@@
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/videodev.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/videodev.h>
+#include <media/v4l2-common.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <asm/system.h>
@@
-599,6
+599,10
@@
v4l_compat_translate_ioctl(struct inode *inode,
dprintk("VIDIOCGPICT / VIDIOC_G_FMT: %d\n",err);
break;
}
dprintk("VIDIOCGPICT / VIDIOC_G_FMT: %d\n",err);
break;
}
+
+ pict->depth = ((fmt2->fmt.pix.bytesperline<<3)
+ + (fmt2->fmt.pix.width-1) )
+ /fmt2->fmt.pix.width;
pict->palette = pixelformat_to_palette(
fmt2->fmt.pix.pixelformat);
break;
pict->palette = pixelformat_to_palette(
fmt2->fmt.pix.pixelformat);
break;