diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2015-08-25 17:40:06 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2015-08-25 17:40:06 -0700 |
| commit | 68a9c8ac774d92e818794a7d3deb83b42c3ea516 (patch) | |
| tree | 7c87704a39e8ab266474d99f7d780a72b890d6ab | |
| parent | b144008c1ba646289453c6731073d98fd8914002 (diff) | |
| download | ffmpeg-68a9c8ac774d92e818794a7d3deb83b42c3ea516.tar.gz | |
swscale: Silence an unused variable warning
Also remove a pair of extraneous ifdeffery.
| -rw-r--r-- | libswscale/swscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index d87efda867..4008210abc 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -490,12 +490,14 @@ static int swscale(SwsContext *c, const uint8_t *src[], for (; dstY < dstH; dstY++) { const int chrDstY = dstY >> c->chrDstVSubSample; +#ifndef NEW_FILTER uint8_t *dest[4] = { dst[0] + dstStride[0] * dstY, dst[1] + dstStride[1] * chrDstY, dst[2] + dstStride[2] * chrDstY, (CONFIG_SWSCALE_ALPHA && alpPixBuf) ? dst[3] + dstStride[3] * dstY : NULL, }; +#endif int use_mmx_vfilter= c->use_mmx_vfilter; // First line needed as input @@ -747,10 +749,8 @@ static int swscale(SwsContext *c, const uint8_t *src[], } } } else if (yuv2packedX) { -#ifndef NEW_FILTER av_assert1(lumSrcPtr + vLumFilterSize - 1 < (const int16_t **)lumPixBuf + vLumBufSize * 2); av_assert1(chrUSrcPtr + vChrFilterSize - 1 < (const int16_t **)chrUPixBuf + vChrBufSize * 2); -#endif if (c->yuv2packed1 && vLumFilterSize == 1 && vChrFilterSize <= 2) { // unscaled RGB int chrAlpha = vChrFilterSize == 1 ? 0 : vChrFilter[2 * dstY + 1]; |