summaryrefslogtreecommitdiff
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-09 00:54:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-09 00:57:12 +0200
commit1752b1459d09d822e2765497416c7dd66e6a875b (patch)
treede7caac4c9e7641e97fd934fb0e00d9614d72712 /libswscale
parent7b2b06eb43d2053a2f6f4a12f2e438285b15576f (diff)
swscale/utils: scale filter_size in warning so that it can be used as max for the compile time define
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 20c2d4e972..7680dbfa49 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -581,7 +581,8 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
goto fail;
if (filterSize >= MAX_FILTER_SIZE * 16 /
((flags & SWS_ACCURATE_RND) ? APCK_SIZE : 16)) {
- av_log(NULL, AV_LOG_ERROR, "sws: filterSize %d is too large, try less extreme scaling or increase MAX_FILTER_SIZE and recompile\n", filterSize);
+ av_log(NULL, AV_LOG_ERROR, "sws: filterSize %d is too large, try less extreme scaling or increase MAX_FILTER_SIZE and recompile\n",
+ FF_CEIL_RSHIFT((filterSize+1) * ((flags & SWS_ACCURATE_RND) ? APCK_SIZE : 16), 4));
goto fail;
}
*outFilterSize = filterSize;