diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-03 16:37:27 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-03 16:37:27 -0300 |
| commit | c9744c4f08675e9a0af829aaf8aafb7b9537ceb7 (patch) | |
| tree | d532290059724636cd89e0da18ed3e7d23be214e | |
| parent | 7b4f0177b23a90aef92464a53e99771e4c3d1bbc (diff) | |
| parent | f6b49c218844c7d0df8010f6745358f5889b52d6 (diff) | |
| download | mediapointer-dvb-s2-c9744c4f08675e9a0af829aaf8aafb7b9537ceb7.tar.gz mediapointer-dvb-s2-c9744c4f08675e9a0af829aaf8aafb7b9537ceb7.tar.bz2 | |
merge: http://linuxtv.org/hg/~quincy/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/v4l1-compat.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/v4l1-compat.c b/linux/drivers/media/video/v4l1-compat.c index 9b5d7e0c0..dc6f00e12 100644 --- a/linux/drivers/media/video/v4l1-compat.c +++ b/linux/drivers/media/video/v4l1-compat.c @@ -611,9 +611,10 @@ v4l_compat_translate_ioctl(struct inode *inode, dprintk("VIDIOCGPICT / VIDIOC_G_FMT: %d\n",err); break; } -#if 0 /* FIXME */ - pict->depth = fmt2->fmt.pix.depth; -#endif + + 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; |