virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

swscale: Fix "warning: ISO C90 forbids mixed declarations and code"

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2016-09-07 01:44:16 +02:00
parent a97e35e7c2
commit ba7be8c083
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libswscale/swscale.c
View File

@ -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)) { if (c->dstXYZ && !(c->srcXYZ && c->srcW==c->dstW && c->srcH==c->dstH)) {
int dstY = c->dstY ? c->dstY : srcSliceY + srcSliceH; 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(dstY >= ret);
av_assert0(ret >= 0); av_assert0(ret >= 0);
av_assert0(c->dstH >= dstY); av_assert0(c->dstH >= dstY);
uint16_t *dst16 = (uint16_t*)(dst2[0] + (dstY - ret) * dstStride2[0]);
/* replace on the same data */ /* replace on the same data */
rgb48Toxyz12(c, dst16, dst16, dstStride2[0]/2, ret); rgb48Toxyz12(c, dst16, dst16, dstStride2[0]/2, ret);
} }