diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-04 23:22:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 17:39:04 +0100 |
| commit | c3abdd0f44615f0bbfde3ebcd1fddabd23d0b332 (patch) | |
| tree | 324ae17bc3249c2fb0971d16933850d2e7878670 | |
| parent | 1363d0759df3c6016bcbc30db016e3706ad5e6a7 (diff) | |
| download | ffmpeg-c3abdd0f44615f0bbfde3ebcd1fddabd23d0b332.tar.gz | |
swscale/utils: Use normal bilinear scaler if fast cannot be used due to tiny dimensions
Fixes Ticket4960
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1edf129cbc897447a289ca8b045853df5df1bab3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libswscale/utils.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index b496b8f525..82c8e5e532 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1045,6 +1045,12 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, srcW, srcH, dstW, dstH); return AVERROR(EINVAL); } + if (flags & SWS_FAST_BILINEAR) { + if (srcW < 8 || dstW < 8) { + flags ^= SWS_FAST_BILINEAR | SWS_BILINEAR; + c->flags = flags; + } + } if (!dstFilter) dstFilter = &dummyFilter; |