Commit 64004337 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent b094e64f
...@@ -555,7 +555,7 @@ static int var_inter(const s16 *old, const s16 *new) ...@@ -555,7 +555,7 @@ static int var_inter(const s16 *old, const s16 *new)
return ret; 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, s16 *deltablock, unsigned int stride,
unsigned int input_step) unsigned int input_step)
{ {
...@@ -566,7 +566,7 @@ static int decide_blocktype(const u8 *current, const u8 *reference, ...@@ -566,7 +566,7 @@ static int decide_blocktype(const u8 *current, const u8 *reference,
int vari; int vari;
int vard; 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); fill_encoder_block(reference, old, 8, 1);
vari = var_intra(tmp); vari = var_intra(tmp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment