virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

sws: make checking for the start of a new frame more explicit

Browse Source
This commit is contained in:
Anton Khirnov
2021-05-20 16:57:52 +02:00
parent 0fb014b7bb
commit 1b11a324fe
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libswscale/swscale.c
View File

@@ -866,6 +866,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
int srcSliceH, uint8_t *const dst[], int srcSliceH, uint8_t *const dst[],
const int dstStride[]) const int dstStride[])
{ {
const int frame_start = !c->sliceDir;
int i, ret; int i, ret;
const uint8_t *src2[4]; const uint8_t *src2[4];
uint8_t *dst2[4]; uint8_t *dst2[4];
@@ -911,11 +912,11 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
if (srcSliceH == 0) if (srcSliceH == 0)
return 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"); av_log(c, AV_LOG_ERROR, "Slices start in the middle!\n");
return 0; return 0;
} }
if (c->sliceDir == 0) { if (frame_start) {
if (srcSliceY == 0) c->sliceDir = 1; else c->sliceDir = -1; if (srcSliceY == 0) c->sliceDir = 1; else c->sliceDir = -1;
} }