Message ID | 20210531075515.19544-8-anton@khirnov.net |
---|---|
State | Accepted |
Commit | d3d8e09640ed311320c2bb50d44d1d977512e972 |
Headers | show |
Series | [FFmpeg-devel,01/24] sws: remove unnecessary braces | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
On Mon, May 31, 2021 at 09:54:59AM +0200, Anton Khirnov wrote: > Reindent after previous commit, rewrap long lines. > --- > libswscale/swscale.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) LGTM thx [...]
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 867995c9c7..7dbe0f59c5 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -847,15 +847,15 @@ static int scale_cascaded(SwsContext *c, int srcSliceY, int srcSliceH, uint8_t * const dst[], const int dstStride[]) { - int ret = sws_scale(c->cascaded_context[0], + int ret = sws_scale(c->cascaded_context[0], srcSlice, srcStride, srcSliceY, srcSliceH, c->cascaded_tmp, c->cascaded_tmpStride); - if (ret < 0) - return ret; - ret = sws_scale(c->cascaded_context[1], - (const uint8_t * const * )c->cascaded_tmp, c->cascaded_tmpStride, 0, c->cascaded_context[0]->dstH, - dst, dstStride); + if (ret < 0) return ret; + ret = sws_scale(c->cascaded_context[1], + (const uint8_t * const * )c->cascaded_tmp, c->cascaded_tmpStride, + 0, c->cascaded_context[0]->dstH, dst, dstStride); + return ret; } /**