diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-07 01:44:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-09-07 01:44:16 +0200 |
| commit | ba7be8c083dfaaf8d6ba4116af332fb4a08f0f8d (patch) | |
| tree | 9a9360fba5c052339823c665680ec45b1776aed2 | |
| parent | a97e35e7c20a25686ebcabfcb3db3bdbaaa40b01 (diff) | |
| download | ffmpeg-ba7be8c083dfaaf8d6ba4116af332fb4a08f0f8d.tar.gz | |
swscale: Fix "warning: ISO C90 forbids mixed declarations and code"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libswscale/swscale.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |