[FFmpeg-cvslog] sws: improve error messages
Michael Niedermayer
git at videolan.org
Sat Oct 27 17:03:05 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 27 16:54:05 2012 +0200| [733f85b7ae02f2e386f0f605bf12c639f2d742fa] | committer: Michael Niedermayer
sws: improve error messages
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=733f85b7ae02f2e386f0f605bf12c639f2d742fa
---
libswscale/utils.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 2fa1c13..b27dc92 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;
More information about the ffmpeg-cvslog
mailing list