Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 200000
b: refs/heads/master
c: 064a248
h: refs/heads/master
v: v3
  • Loading branch information
Ian Armstrong authored and Mauro Carvalho Chehab committed Jun 1, 2010
1 parent a3d9855 commit 35a6c0e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6afdeaf865b729287e02aafc61d8d013b89996ef
refs/heads/master: 064a2485aa45956cf1e8520e716839e9d7555b90
6 changes: 1 addition & 5 deletions trunk/drivers/media/video/cx2341x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,6 @@ static const char *cx2341x_menu_item(const struct cx2341x_mpeg_params *p, u32 id
void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
{
int is_mpeg1 = p->video_encoding == V4L2_MPEG_VIDEO_ENCODING_MPEG_1;
int temporal = p->video_temporal_filter;

/* Stream */
printk(KERN_INFO "%s: Stream: %s",
Expand Down Expand Up @@ -1179,14 +1178,11 @@ void cx2341x_log_status(const struct cx2341x_mpeg_params *p, const char *prefix)
V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE),
p->video_spatial_filter);

if (p->width != 720 || p->height != (p->is_50hz ? 576 : 480))
temporal = 0;

printk(KERN_INFO "%s: Temporal Filter: %s, %d\n",
prefix,
cx2341x_menu_item(p,
V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE),
temporal);
p->video_temporal_filter);
printk(KERN_INFO
"%s: Median Filter: %s, Luma [%d, %d], Chroma [%d, %d]\n",
prefix,
Expand Down

0 comments on commit 35a6c0e

Please sign in to comment.