[FFmpeg-cvslog] swscale/utils: dont print message about filter size when the cause is a malloc failure

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  9 00:23:56 2014 +0200| [7b2b06eb43d2053a2f6f4a12f2e438285b15576f] | committer: Michael Niedermayer

swscale/utils: dont print message about filter size when the cause is a malloc failure

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b2b06eb43d2053a2f6f4a12f2e438285b15576f
---

 libswscale/utils.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 983824b..20c2d4e 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -577,8 +577,10 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
     filterSize = (minFilterSize + (filterAlign - 1)) & (~(filterAlign - 1));
     av_assert0(filterSize > 0);
     filter = av_malloc(filterSize * dstW * sizeof(*filter));
+    if (!filter)
+        goto fail;
     if (filterSize >= MAX_FILTER_SIZE * 16 /
-                      ((flags & SWS_ACCURATE_RND) ? APCK_SIZE : 16) || !filter) {
+                      ((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);
         goto fail;
     }