diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:17:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-11 18:17:50 -0300 |
| commit | fd4694cdbe15f591792ec5166c3d9791c4b1e34f (patch) | |
| tree | 99866153be11055c726828017b089a40e7f8daa1 /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | 4b038fe7fa0a646fedf0e49aa2bfba38c814e3ad (diff) | |
| parent | aaaaa6a00dd372109ceb39c63aef9088ec86e344 (diff) | |
| download | mediapointer-dvb-s2-fd4694cdbe15f591792ec5166c3d9791c4b1e34f.tar.gz mediapointer-dvb-s2-fd4694cdbe15f591792ec5166c3d9791c4b1e34f.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index dd22a5215..96334a20b 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -255,6 +255,16 @@ static int empress_s_fmt_vid_cap(struct file *file, void *priv, return 0; } +static int empress_try_fmt_vid_cap(struct file *file, void *priv, + struct v4l2_format *f) +{ + struct saa7134_dev *dev = file->private_data; + + f->fmt.pix.pixelformat = V4L2_PIX_FMT_MPEG; + f->fmt.pix.sizeimage = TS_PACKET_SIZE * dev->ts.nr_packets; + + return 0; +} static int empress_reqbufs(struct file *file, void *priv, struct v4l2_requestbuffers *p) @@ -450,6 +460,7 @@ static const struct v4l2_file_operations ts_fops = static const struct v4l2_ioctl_ops ts_ioctl_ops = { .vidioc_querycap = empress_querycap, .vidioc_enum_fmt_vid_cap = empress_enum_fmt_vid_cap, + .vidioc_try_fmt_vid_cap = empress_try_fmt_vid_cap, .vidioc_s_fmt_vid_cap = empress_s_fmt_vid_cap, .vidioc_g_fmt_vid_cap = empress_g_fmt_vid_cap, .vidioc_reqbufs = empress_reqbufs, |