summaryrefslogtreecommitdiff
path: root/libswscale
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2014-06-11 17:51:49 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2014-06-13 14:49:59 +0100
commita4bd4733c0af333f2907f6be276b5094891903a0 (patch)
tree41e365a6809354261b5bc028bf94266704160f32 /libswscale
parent681868cbbe8a596860c454d34f259941e0c44d73 (diff)
swscale: Allow the max filter size to be set at compile time
This can help "extreme" resizes, e.g with some 4k stuff. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale_internal.h2
-rw-r--r--libswscale/utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 42a17e551a..8cf431733a 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -39,7 +39,7 @@
#define YUVRGB_TABLE_HEADROOM 128
-#define MAX_FILTER_SIZE 256
+#define MAX_FILTER_SIZE SWS_MAX_FILTER_SIZE
#define DITHER1XBPP
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 92b2ac4f26..7274153453 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -582,7 +582,7 @@ 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",
+ av_log(NULL, AV_LOG_ERROR, "sws: filterSize %d is too large, try less extreme scaling or set --sws-max-filter-size and recompile\n",
FF_CEIL_RSHIFT((filterSize+1) * ((flags & SWS_ACCURATE_RND) ? APCK_SIZE : 16), 4));
goto fail;
}