hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Hans Verkuil 2018-07-26 03:11:01 -04:00 committed by Mauro Carvalho Chehab
parent b094e64fbd
commit 64004337d0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/vicodec/vicodec-codec.c
View File

@ -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);