ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed Sep 7 01:44:16 2016 +0200| [ba7be8c083dfaaf8d6ba4116af332fb4a08f0f8d] | committer: Michael Niedermayer
swscale: Fix "warning: ISO C90 forbids mixed declarations and code" Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba7be8c083dfaaf8d6ba4116af332fb4a08f0f8d --- libswscale/swscale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a192a1f..0874556 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); } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
