diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-08 12:21:00 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-08 12:21:00 +0200 |
| commit | a938ca9971031bb3895c624e6bc26d92da85a960 (patch) | |
| tree | e375dd48ff1954d1dbcc688f349407871d338fd9 /linux/drivers/media/video/cx2341x.c | |
| parent | 387f6919b61c886b36fea9568a6ad6e0842c2e6f (diff) | |
| download | mediapointer-dvb-s2-a938ca9971031bb3895c624e6bc26d92da85a960.tar.gz mediapointer-dvb-s2-a938ca9971031bb3895c624e6bc26d92da85a960.tar.bz2 | |
v4l2: extend MPEG Encoding API with AVC and AAC
From: Janne Grunau <j@jannau.net>
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.
Priority: normal
Signed-off-by: Janne Grunau <j@jannau.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/cx2341x.c')
| -rw-r--r-- | linux/drivers/media/video/cx2341x.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx2341x.c b/linux/drivers/media/video/cx2341x.c index 835062f5b..f31f11e3f 100644 --- a/linux/drivers/media/video/cx2341x.c +++ b/linux/drivers/media/video/cx2341x.c @@ -509,7 +509,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; |