mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '263efc095e6c7ec2902119118b084cea29ea8916'
* commit '263efc095e6c7ec2902119118b084cea29ea8916': jfdct: Kill broken cruft Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
commit
92cd2c04b1
|
@ -69,12 +69,7 @@
|
||||||
#define GLOBAL(x) x
|
#define GLOBAL(x) x
|
||||||
#define RIGHT_SHIFT(x, n) ((x) >> (n))
|
#define RIGHT_SHIFT(x, n) ((x) >> (n))
|
||||||
#define MULTIPLY16C16(var,const) ((var)*(const))
|
#define MULTIPLY16C16(var,const) ((var)*(const))
|
||||||
|
|
||||||
#if 1 //def USE_ACCURATE_ROUNDING
|
|
||||||
#define DESCALE(x,n) RIGHT_SHIFT((x) + (1 << ((n) - 1)), n)
|
#define DESCALE(x,n) RIGHT_SHIFT((x) + (1 << ((n) - 1)), n)
|
||||||
#else
|
|
||||||
#define DESCALE(x,n) RIGHT_SHIFT(x, n)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue