aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cx18/cx18-ioctl.c4
-rw-r--r--drivers/media/video/ivtv/ivtv-ioctl.c9
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index 395382798fb8..f66ca0b39520 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -244,10 +244,6 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
244 244
245 cx->params.width = w; 245 cx->params.width = w;
246 cx->params.height = h; 246 cx->params.height = h;
247 if (w != 720 || h != (cx->is_50hz ? 576 : 480))
248 cx->params.video_temporal_filter = 0;
249 else
250 cx->params.video_temporal_filter = 8;
251 cx18_av_cmd(cx, VIDIOC_S_FMT, fmt); 247 cx18_av_cmd(cx, VIDIOC_S_FMT, fmt);
252 return cx18_g_fmt_vid_cap(file, fh, fmt); 248 return cx18_g_fmt_vid_cap(file, fh, fmt);
253} 249}
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index d75c82e509f7..b1cda6cd5582 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -508,11 +508,6 @@ static int ivtv_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format
508 ivtv_g_fmt_vid_cap(file, fh, fmt); 508 ivtv_g_fmt_vid_cap(file, fh, fmt);
509 fmt->fmt.pix.width = w; 509 fmt->fmt.pix.width = w;
510 fmt->fmt.pix.height = h; 510 fmt->fmt.pix.height = h;
511 if (itv->params.width != 720 ||
512 itv->params.height != (itv->is_50hz ? 576 : 480))
513 itv->params.video_temporal_filter = 0;
514 else
515 itv->params.video_temporal_filter = 8;
516 return 0; 511 return 0;
517} 512}
518 513
@@ -608,10 +603,6 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
608 603
609 p->width = w; 604 p->width = w;
610 p->height = h; 605 p->height = h;
611 if (w != 720 || h != (itv->is_50hz ? 576 : 480))
612 p->video_temporal_filter = 0;
613 else
614 p->video_temporal_filter = 8;
615 if (p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1) 606 if (p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1)
616 fmt->fmt.pix.width /= 2; 607 fmt->fmt.pix.width /= 2;
617 itv->video_dec_func(itv, VIDIOC_S_FMT, fmt); 608 itv->video_dec_func(itv, VIDIOC_S_FMT, fmt);