---
libswscale/ppc/swscale_altivec.c | 3 +--
libswscale/swscale.c | 11 +++++------
libswscale/swscale_internal.h | 6 ++----
libswscale/x86/swscale_template.c | 3 +--
4 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c
index 050af19..a5b7dc5 100644
--- a/libswscale/ppc/swscale_altivec.c
+++ b/libswscale/ppc/swscale_altivec.c
@@ -221,8 +221,7 @@ yuv2yuvX_altivec_real(SwsContext *c,
}
static void hScale_altivec_real(int16_t *dst, int dstW,
- const uint8_t *src, int srcW,
- int xInc, const int16_t *filter,
+ const uint8_t *src, const int16_t *filter,
const int16_t *filterPos, int filterSize)
{
register int i;
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index f94e403..5da276e 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1906,8 +1906,8 @@ static void rgb24ToUV_half_c(uint8_t *dstU, uint8_t
*dstV, const uint8_t *src1,
}
static void hScale16_c(int16_t *_dst, int dstW, const uint8_t *_src,
- int srcW, int xInc, const int16_t *filter,
- const int16_t *filterPos, int filterSize)
+ const int16_t *filter, const int16_t *filterPos,
+ int filterSize)
{
int i;
int32_t *dst = (int32_t *) _dst;
@@ -1928,7 +1928,6 @@ static void hScale16_c(int16_t *_dst, int dstW, const
uint8_t *_src,
// bilinear / bicubic scaling
static void hScale_c(int16_t *dst, int dstW, const uint8_t *src,
- int srcW, int xInc,
const int16_t *filter, const int16_t *filterPos,
int filterSize)
{
@@ -2016,7 +2015,7 @@ static av_always_inline void hyscale(SwsContext *c,
int16_t *dst, int dstWidth,
}
if (!c->hyscale_fast) {
- c->hScale(dst, dstWidth, src, srcW, xInc, hLumFilter, hLumFilterPos,
hLumFilterSize);
+ c->hScale(dst, dstWidth, src, hLumFilter, hLumFilterPos,
hLumFilterSize);
} else { // fast bilinear upscale / crap downscale
c->hyscale_fast(c, dst, dstWidth, src, srcW, xInc);
}
@@ -2077,8 +2076,8 @@ static av_always_inline void hcscale(SwsContext *c,
int16_t *dst1, int16_t *dst2
}
if (!c->hcscale_fast) {
- c->hScale(dst1, dstWidth, src1, srcW, xInc, hChrFilter, hChrFilterPos,
hChrFilterSize);
- c->hScale(dst2, dstWidth, src2, srcW, xInc, hChrFilter, hChrFilterPos,
hChrFilterSize);
+ c->hScale(dst1, dstWidth, src1, hChrFilter, hChrFilterPos,
hChrFilterSize);
+ c->hScale(dst2, dstWidth, src2, hChrFilter, hChrFilterPos,
hChrFilterSize);
} else { // fast bilinear upscale / crap downscale
c->hcscale_fast(c, dst1, dst2, dstWidth, src1, src2, srcW, xInc);
}
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 70b1112..d3a30bf 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -435,8 +435,6 @@ typedef struct SwsContext {
* @param src pointer to source data to be scaled. If scaling depth is
* 8, this is 8bpp in 8bpp (uint8_t) width. If scaling depth
* is 16, this is 16bpp in 16bpp (uint16_t) depth.
- * @param srcW unused
- * @param xInc unused
* @param filter filter coefficients to be used per output pixel for
* scaling. This contains 14bpp filtering coefficients.
* Guaranteed to contain dstW * filterSize entries.
@@ -449,8 +447,8 @@ typedef struct SwsContext {
* (and input coefficients thus padded with zeroes)
* to simplify creating SIMD code.
*/
- void (*hScale)(int16_t *dst, int dstW, const uint8_t *src, int srcW,
- int xInc, const int16_t *filter, const int16_t *filterPos,
+ void (*hScale)(int16_t *dst, int dstW, const uint8_t *src,
+ const int16_t *filter, const int16_t *filterPos,
int filterSize);
void (*lumConvertRange)(int16_t *dst, int width); ///< Color range
conversion function for luma plane if needed.
diff --git a/libswscale/x86/swscale_template.c
b/libswscale/x86/swscale_template.c
index 5af132e..cccba34 100644
--- a/libswscale/x86/swscale_template.c
+++ b/libswscale/x86/swscale_template.c
@@ -1860,8 +1860,7 @@ static void RENAME(rgb24ToUV)(uint8_t *dstU, uint8_t
*dstV,
#if !COMPILE_TEMPLATE_MMX2
// bilinear / bicubic scaling
static void RENAME(hScale)(int16_t *dst, int dstW,
- const uint8_t *src, int srcW,
- int xInc, const int16_t *filter,
+ const uint8_t *src, const int16_t *filter,
const int16_t *filterPos, int filterSize)
{
assert(filterSize % 4 == 0 && filterSize>0);
--
1.7.2.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
