summaryrefslogtreecommitdiff
path: root/libswscale
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2021-05-20 16:57:52 +0200
committerAnton Khirnov <anton@khirnov.net>2021-07-03 16:07:22 +0200
commit1b11a324feb56ec70161f856c5fb103363cff0af (patch)
tree958f8b7b771044937b4f5811d31346429a847463 /libswscale
parent0fb014b7bb6e60cca8828467ec937cc51dbaa166 (diff)
sws: make checking for the start of a new frame more explicit
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index dbbb930f9a..0f05ba01f6 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -866,6 +866,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
int srcSliceH, uint8_t *const dst[],
const int dstStride[])
{
+ const int frame_start = !c->sliceDir;
int i, ret;
const uint8_t *src2[4];
uint8_t *dst2[4];
@@ -911,11 +912,11 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
if (srcSliceH == 0)
return 0;
- if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
+ if (frame_start && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n");
return 0;
}
- if (c->sliceDir == 0) {
+ if (frame_start) {
if (srcSliceY == 0) c->sliceDir = 1; else c->sliceDir = -1;
}