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

sws: move the early return for zero-sized slices higher up

Browse Source 
Place it right after the input parameter validation. There is no point
in performing any setup if the sws_scale() call won't do anything.
This commit is contained in:
Anton Khirnov 2021-05-21 12:06:52 +02:00
parent a91e6c927e
commit e188985598
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libswscale/swscale.c
View File

@ -897,6 +897,10 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
// do not mess up sliceDir if we have a "trailing" 0-size slice
if (srcSliceH == 0)
return 0;
if (c->gamma_flag && c->cascaded_context[0]) if (c->gamma_flag && c->cascaded_context[0])
return scale_gamma(c, srcSlice, srcStride, srcSliceY, srcSliceH, dst, dstStride); return scale_gamma(c, srcSlice, srcStride, srcSliceY, srcSliceH, dst, dstStride);
@ -908,10 +912,6 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
memcpy(srcStride2, srcStride, sizeof(srcStride2)); memcpy(srcStride2, srcStride, sizeof(srcStride2));
memcpy(dstStride2, dstStride, sizeof(dstStride2)); memcpy(dstStride2, dstStride, sizeof(dstStride2));
// do not mess up sliceDir if we have a "trailing" 0-size slice
if (srcSliceH == 0)
return 0;
if (frame_start) { if (frame_start) {
if (srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) { if (srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n"); av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n");