Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-27 18:54:05 +0400
committerMichael Niedermayer <michaelni@gmx.at>2012-10-27 18:54:05 +0400
commit733f85b7ae02f2e386f0f605bf12c639f2d742fa (patch)
tree9acd942aa00af9eebbe49cd6c86a0ce1bb00aca8 /libswscale
parent7de21960292c15e544807f09d1bfc9935a88e5ce (diff)
sws: improve error messages
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/utils.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 2fa1c13ba6..b27dc927e3 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -513,8 +513,10 @@ static int initFilter(int16_t **outFilter, int32_t **filterPos,
av_assert0(filterSize > 0);
filter = av_malloc(filterSize * dstW * sizeof(*filter));
if (filterSize >= MAX_FILTER_SIZE * 16 /
- ((flags & SWS_ACCURATE_RND) ? APCK_SIZE : 16) || !filter)
+ ((flags & SWS_ACCURATE_RND) ? APCK_SIZE : 16) || !filter) {
+ av_log(NULL, AV_LOG_ERROR, "sws: filterSize %d is too large, try less extreem scaling or increase MAX_FILTER_SIZE and recompile\n", filterSize);
goto fail;
+ }
*outFilterSize = filterSize;
if (flags & SWS_PRINT_INFO)
@@ -599,6 +601,8 @@ static int initFilter(int16_t **outFilter, int32_t **filterPos,
ret = 0;
fail:
+ if(ret < 0)
+ av_log(NULL, AV_LOG_ERROR, "sws: initFilter failed\n");
av_free(filter);
av_free(filter2);
return ret;