aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2011-02-07 02:37:38 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 19:32:12 -0400
commitd63044401a107ef22521e62c7f9b30c40b7c44ed (patch)
tree44743266a47ffe0c0205920765e7ddc68a3d1269 /drivers/media/video/saa7134
parente68044e2351ee937997c1e014fbbbe1c97b935cf (diff)
[media] saa7134-empress: add missing MPEG controls
Reported by, and based on a patch from, Martin Dauskardt. The AUDIO_AC3_BITRATE control is still missing from this list, but such optional controls are a bit hard to handle. This will be fixed automatically when we switch to the control framework. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Reported-by: Martin Dauskardt <martin.dauskardt@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-empress.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index 6b8459c7728..18294db38a0 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -373,6 +373,10 @@ static int empress_queryctrl(struct file *file, void *priv,
373 static const u32 mpeg_ctrls[] = { 373 static const u32 mpeg_ctrls[] = {
374 V4L2_CID_MPEG_CLASS, 374 V4L2_CID_MPEG_CLASS,
375 V4L2_CID_MPEG_STREAM_TYPE, 375 V4L2_CID_MPEG_STREAM_TYPE,
376 V4L2_CID_MPEG_STREAM_PID_PMT,
377 V4L2_CID_MPEG_STREAM_PID_AUDIO,
378 V4L2_CID_MPEG_STREAM_PID_VIDEO,
379 V4L2_CID_MPEG_STREAM_PID_PCR,
376 V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ, 380 V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ,
377 V4L2_CID_MPEG_AUDIO_ENCODING, 381 V4L2_CID_MPEG_AUDIO_ENCODING,
378 V4L2_CID_MPEG_AUDIO_L2_BITRATE, 382 V4L2_CID_MPEG_AUDIO_L2_BITRATE,