mirror of https://git.ffmpeg.org/ffmpeg.git
swscale/swscale: Check srcSliceH for bayer
Fixes: Assertion srcSliceH > 1 failed at libswscale/swscale_unscaled.c:1359
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 64098d0cd8
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
0898209a48
commit
8b79265d2d
|
@ -778,7 +778,8 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
|
||||||
|
|
||||||
if ((srcSliceY & (macro_height-1)) ||
|
if ((srcSliceY & (macro_height-1)) ||
|
||||||
((srcSliceH& (macro_height-1)) && srcSliceY + srcSliceH != c->srcH) ||
|
((srcSliceH& (macro_height-1)) && srcSliceY + srcSliceH != c->srcH) ||
|
||||||
srcSliceY + srcSliceH > c->srcH) {
|
srcSliceY + srcSliceH > c->srcH ||
|
||||||
|
(isBayer(c->srcFormat) && srcSliceH <= 1)) {
|
||||||
av_log(c, AV_LOG_ERROR, "Slice parameters %d, %d are invalid\n", srcSliceY, srcSliceH);
|
av_log(c, AV_LOG_ERROR, "Slice parameters %d, %d are invalid\n", srcSliceY, srcSliceH);
|
||||||
return AVERROR(EINVAL);
|
return AVERROR(EINVAL);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue