From: Michael Niedermayer Date: Tue, 6 Sep 2016 23:44:16 +0000 (+0200) Subject: swscale: Fix "warning: ISO C90 forbids mixed declarations and code" X-Git-Tag: n3.2~545 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=ba7be8c083dfaaf8d6ba4116af332fb4a08f0f8d;hp=a97e35e7c20a25686ebcabfcb3db3bdbaaa40b01;ds=sidebyside swscale: Fix "warning: ISO C90 forbids mixed declarations and code" Signed-off-by: Michael Niedermayer --- diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a192a1fb3f..08745561f7 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -979,11 +979,11 @@ int attribute_align_arg sws_scale(struct SwsContext *c, if (c->dstXYZ && !(c->srcXYZ && c->srcW==c->dstW && c->srcH==c->dstH)) { int dstY = c->dstY ? c->dstY : srcSliceY + srcSliceH; + uint16_t *dst16 = (uint16_t*)(dst2[0] + (dstY - ret) * dstStride2[0]); av_assert0(dstY >= ret); av_assert0(ret >= 0); av_assert0(c->dstH >= dstY); - uint16_t *dst16 = (uint16_t*)(dst2[0] + (dstY - ret) * dstStride2[0]); /* replace on the same data */ rgb48Toxyz12(c, dst16, dst16, dstStride2[0]/2, ret); }