diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-controls.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-controls.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c index b59475bfc243..b588e30cbcf0 100644 --- a/drivers/media/video/ivtv/ivtv-controls.c +++ b/drivers/media/video/ivtv/ivtv-controls.c | |||
@@ -267,13 +267,13 @@ int ivtv_s_ext_ctrls(struct file *file, void *fh, struct v4l2_ext_controls *c) | |||
267 | if (p.video_encoding != itv->params.video_encoding) { | 267 | if (p.video_encoding != itv->params.video_encoding) { |
268 | int is_mpeg1 = p.video_encoding == | 268 | int is_mpeg1 = p.video_encoding == |
269 | V4L2_MPEG_VIDEO_ENCODING_MPEG_1; | 269 | V4L2_MPEG_VIDEO_ENCODING_MPEG_1; |
270 | struct v4l2_format fmt; | 270 | struct v4l2_mbus_framefmt fmt; |
271 | 271 | ||
272 | /* fix videodecoder resolution */ | 272 | /* fix videodecoder resolution */ |
273 | fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; | 273 | fmt.width = itv->params.width / (is_mpeg1 ? 2 : 1); |
274 | fmt.fmt.pix.width = itv->params.width / (is_mpeg1 ? 2 : 1); | 274 | fmt.height = itv->params.height; |
275 | fmt.fmt.pix.height = itv->params.height; | 275 | fmt.code = V4L2_MBUS_FMT_FIXED; |
276 | v4l2_subdev_call(itv->sd_video, video, s_fmt, &fmt); | 276 | v4l2_subdev_call(itv->sd_video, video, s_mbus_fmt, &fmt); |
277 | } | 277 | } |
278 | err = cx2341x_update(itv, ivtv_api_func, &itv->params, &p); | 278 | err = cx2341x_update(itv, ivtv_api_func, &itv->params, &p); |
279 | if (!err && itv->params.stream_vbi_fmt != p.stream_vbi_fmt) | 279 | if (!err && itv->params.stream_vbi_fmt != p.stream_vbi_fmt) |