diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:29:48 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:29:48 -0200 |
| commit | 20a16b5ff3c186e90241702dbbc00a25d0b1b9e2 (patch) | |
| tree | 9cf76edcb9951186fccb7d89db0cb45a1bb637b1 /linux/drivers/media/video/cx2341x.c | |
| parent | 27bdf53f81e7783e79bcd334e4d3d5d329708694 (diff) | |
| parent | 646f5e295e95d6295503fd5b3f5105102c8cc687 (diff) | |
| download | mediapointer-dvb-s2-20a16b5ff3c186e90241702dbbc00a25d0b1b9e2.tar.gz mediapointer-dvb-s2-20a16b5ff3c186e90241702dbbc00a25d0b1b9e2.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-lib
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx2341x.c')
| -rw-r--r-- | linux/drivers/media/video/cx2341x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx2341x.c b/linux/drivers/media/video/cx2341x.c index c92b98135..01c4d2d02 100644 --- a/linux/drivers/media/video/cx2341x.c +++ b/linux/drivers/media/video/cx2341x.c @@ -39,6 +39,7 @@ static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "Debug level (0-1)"); +/* Must be sorted from low to high control ID! */ const u32 cx2341x_mpeg_ctrls[] = { V4L2_CID_MPEG_CLASS, V4L2_CID_MPEG_STREAM_TYPE, @@ -46,12 +47,12 @@ const u32 cx2341x_mpeg_ctrls[] = { V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ, V4L2_CID_MPEG_AUDIO_ENCODING, V4L2_CID_MPEG_AUDIO_L2_BITRATE, - V4L2_CID_MPEG_AUDIO_AC3_BITRATE, V4L2_CID_MPEG_AUDIO_MODE, V4L2_CID_MPEG_AUDIO_MODE_EXTENSION, V4L2_CID_MPEG_AUDIO_EMPHASIS, V4L2_CID_MPEG_AUDIO_CRC, V4L2_CID_MPEG_AUDIO_MUTE, + V4L2_CID_MPEG_AUDIO_AC3_BITRATE, V4L2_CID_MPEG_VIDEO_ENCODING, V4L2_CID_MPEG_VIDEO_ASPECT, V4L2_CID_MPEG_VIDEO_B_FRAMES, |