summaryrefslogtreecommitdiff
path: root/drivers/media/video/cx2341x.c
diff options
context:
space:
mode:
authorJanne Grunau <j@jannau.net>2008-08-08 14:21:00 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 15:36:47 +0400
commit188919ac57810e39138749338d5a33ba1e970e23 (patch)
tree4ec96a44894c8d3ea7557393eb1fac08536564f6 /drivers/media/video/cx2341x.c
parenta832781cd383e70929c0ceece23f8a5b62e2152b (diff)
downloadlinux-188919ac57810e39138749338d5a33ba1e970e23.tar.xz
V4L/DVB (8634): v4l2: extend MPEG Encoding API with AVC and AAC
Adds Advanced Audio Coding (AAC) and MPEG-4 Advanced Video Coding (AVC/H.264) as audio/video codecs to the extended controls API. Updates cx2341x driver to the new values. Signed-off-by: Janne Grunau <j@jannau.net> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx2341x.c')
-rw-r--r--drivers/media/video/cx2341x.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/cx2341x.c b/drivers/media/video/cx2341x.c
index 22847a0444f5..cbbe47fb87b7 100644
--- a/drivers/media/video/cx2341x.c
+++ b/drivers/media/video/cx2341x.c
@@ -508,7 +508,10 @@ int cx2341x_ctrl_query(const struct cx2341x_mpeg_params *params,
/* this setting is read-only for the cx2341x since the
V4L2_CID_MPEG_STREAM_TYPE really determines the
MPEG-1/2 setting */
- err = v4l2_ctrl_query_fill_std(qctrl);
+ err = v4l2_ctrl_query_fill(qctrl,
+ V4L2_MPEG_VIDEO_ENCODING_MPEG_1,
+ V4L2_MPEG_VIDEO_ENCODING_MPEG_2, 1,
+ V4L2_MPEG_VIDEO_ENCODING_MPEG_2);
if (err == 0)
qctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY;
return err;