diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 19:24:02 (GMT) |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 19:24:02 (GMT) |
commit | db0a2901a32c44510d7d429358d017143a649a70 (patch) | |
tree | 4e4e41cf2e27aa4940f9c0711ca2a3bf7557a805 /drivers/media/video/btcx-risc.c | |
parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
parent | 4cce1655b26a4df1e619b2aa3d2eea1b7a6e906c (diff) | |
download | linux-db0a2901a32c44510d7d429358d017143a649a70.tar.xz |
Merge branch 'fixes_stg' of ../git_old into fixes
Diffstat (limited to 'drivers/media/video/btcx-risc.c')
-rw-r--r-- | drivers/media/video/btcx-risc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/btcx-risc.c b/drivers/media/video/btcx-risc.c index f42701f..3324ab3 100644 --- a/drivers/media/video/btcx-risc.c +++ b/drivers/media/video/btcx-risc.c @@ -184,12 +184,12 @@ btcx_sort_clips(struct v4l2_clip *clips, unsigned int nclips) } void -btcx_calc_skips(int line, int width, unsigned int *maxy, +btcx_calc_skips(int line, int width, int *maxy, struct btcx_skiplist *skips, unsigned int *nskips, const struct v4l2_clip *clips, unsigned int nclips) { unsigned int clip,skip; - int end,maxline; + int end, maxline; skip=0; maxline = 9999; |