diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-12 15:52:00 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-12 15:52:00 +0300 |
| commit | fdb2f3c8ab4714d9da3189623133e5d3d639f701 (patch) | |
| tree | 55819bb3fbd03df6e0442c5930397ee83bd0a11d /libmpcodecs/vf_hqdn3d.c | |
| parent | bb6c06d17f661ff99edb0eb1dc9c0a12770f887f (diff) | |
| parent | 5671f4329ee4f5503651377acb78ca90236c66e7 (diff) | |
| download | mpv-fdb2f3c8ab4714d9da3189623133e5d3d639f701.tar.bz2 mpv-fdb2f3c8ab4714d9da3189623133e5d3d639f701.tar.xz | |
Merge svn changes up to r29417
Diffstat (limited to 'libmpcodecs/vf_hqdn3d.c')
| -rw-r--r-- | libmpcodecs/vf_hqdn3d.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpcodecs/vf_hqdn3d.c b/libmpcodecs/vf_hqdn3d.c index 8906060719..a62854c2da 100644 --- a/libmpcodecs/vf_hqdn3d.c +++ b/libmpcodecs/vf_hqdn3d.c @@ -64,7 +64,7 @@ static int config(struct vf_instance* vf, static inline unsigned int LowPassMul(unsigned int PrevMul, unsigned int CurrMul, int* Coef){ // int dMul= (PrevMul&0xFFFFFF)-(CurrMul&0xFFFFFF); int dMul= PrevMul-CurrMul; - int d=((dMul+0x10007FF)>>12); + unsigned int d=((dMul+0x10007FF)>>12); return CurrMul + Coef[d]; } @@ -75,7 +75,7 @@ static void deNoiseTemporal( int W, int H, int sStride, int dStride, int *Temporal) { - int X, Y; + long X, Y; unsigned int PixelDst; for (Y = 0; Y < H; Y++){ @@ -97,8 +97,8 @@ static void deNoiseSpacial( int W, int H, int sStride, int dStride, int *Horizontal, int *Vertical) { - int X, Y; - int sLineOffs = 0, dLineOffs = 0; + long X, Y; + long sLineOffs = 0, dLineOffs = 0; unsigned int PixelAnt; unsigned int PixelDst; @@ -137,8 +137,8 @@ static void deNoise(unsigned char *Frame, // mpi->planes[x] int W, int H, int sStride, int dStride, int *Horizontal, int *Vertical, int *Temporal) { - int X, Y; - int sLineOffs = 0, dLineOffs = 0; + long X, Y; + long sLineOffs = 0, dLineOffs = 0; unsigned int PixelAnt; unsigned int PixelDst; unsigned short* FrameAnt=(*FrameAntPtr); |