diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2018-07-26 10:11:01 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-07-27 13:39:57 +0300 |
| commit | 64004337d0d8842b8993107c8427b80d6e36646c (patch) | |
| tree | 49c7fd3dde23a154d230caab9a2a5f04c4780248 | |
| parent | b094e64fbd88dfcde137c2235b58c904ccac00ea (diff) | |
| download | linux-64004337d0d8842b8993107c8427b80d6e36646c.tar.xz | |
media: vicodec: current -> cur
'current' is also defined in asm-generic/current.h.
When compiling this driver for older kernels with the media_build system,
this header is included via compat.h and it no longer compiles. Rename
current to cur.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/platform/vicodec/vicodec-codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/vicodec/vicodec-codec.c b/drivers/media/platform/vicodec/vicodec-codec.c index e880a6c5747f..2d047646f614 100644 --- a/drivers/media/platform/vicodec/vicodec-codec.c +++ b/drivers/media/platform/vicodec/vicodec-codec.c @@ -555,7 +555,7 @@ static int var_inter(const s16 *old, const s16 *new) return ret; } -static int decide_blocktype(const u8 *current, const u8 *reference, +static int decide_blocktype(const u8 *cur, const u8 *reference, s16 *deltablock, unsigned int stride, unsigned int input_step) { @@ -566,7 +566,7 @@ static int decide_blocktype(const u8 *current, const u8 *reference, int vari; int vard; - fill_encoder_block(current, tmp, stride, input_step); + fill_encoder_block(cur, tmp, stride, input_step); fill_encoder_block(reference, old, 8, 1); vari = var_intra(tmp); |