From 18bc4e2bf94326ec97fb43376bec77e24c7f5c6a Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 19 Jun 2006 18:00:06 -0300 Subject: [PATCH] --- yaml --- r: 30069 b: refs/heads/master c: 54aa9a21ca03cf41d911ada969e86f27ce58bab9 h: refs/heads/master i: 30067: f054e6a8a5545a54fa4d0cf92466101863f1050d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx2341x.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8c820b14f7d2..83d505b4029f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc7bc648690d4e6f3992cfadb18a4c7e0181e6ea +refs/heads/master: 54aa9a21ca03cf41d911ada969e86f27ce58bab9 diff --git a/trunk/drivers/media/video/cx2341x.c b/trunk/drivers/media/video/cx2341x.c index 4c457dc6a403..7cd1c4cf5aec 100644 --- a/trunk/drivers/media/video/cx2341x.c +++ b/trunk/drivers/media/video/cx2341x.c @@ -406,6 +406,12 @@ int cx2341x_ctrl_query(struct cx2341x_mpeg_params *params, struct v4l2_queryctrl qctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY; return err; + case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: + err = v4l2_ctrl_query_fill_std(qctrl); + if (err == 0 && params->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1) + qctrl->flags |= V4L2_CTRL_FLAG_INACTIVE; + return err; + case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK: err = v4l2_ctrl_query_fill_std(qctrl); if (err == 0 && params->video_bitrate_mode == V4L2_MPEG_VIDEO_BITRATE_MODE_CBR)