diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-04 23:22:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-15 12:30:40 +0100 |
| commit | 14c63dc9b0d8ca0f99e4b73b8b9329012917da46 (patch) | |
| tree | ec91f1ca1cae4b2f556771bd832327b9f6100101 | |
| parent | 709abc74f5ef5459e93faec227ec9c4a0b5ff954 (diff) | |
| download | ffmpeg-14c63dc9b0d8ca0f99e4b73b8b9329012917da46.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 5610701136..a108d99b8f 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1193,6 +1193,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; |