ffmpeg | branch: master | Timothy Gu <timothyg...@gmail.com> | Tue Aug 25 17:40:06 2015 -0700| [68a9c8ac774d92e818794a7d3deb83b42c3ea516] | committer: Timothy Gu
swscale: Silence an unused variable warning Also remove a pair of extraneous ifdeffery. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68a9c8ac774d92e818794a7d3deb83b42c3ea516 --- libswscale/swscale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index d87efda..4008210 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]; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
