Merge commit 'e878ec0d47cd6228c367b2f3128b76d7523f7255'

[ffmpeg] / libswscale / utils.c

diff --git a/libswscale/utils.c b/libswscale/utils.c
index cfa6b2179488d2db1b3915514d94859cddb1f10c..df8d0a92caf8f86591f4e7305d36d965c9cbc9d5 100644 (file)
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1184,7 +1184,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
     c->chrDstW = FF_CEIL_RSHIFT(dstW, c->chrDstHSubSample);
     c->chrDstH = FF_CEIL_RSHIFT(dstH, c->chrDstVSubSample);
 
-    FF_ALLOC_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW*2+78, 16) * 2, fail);
+    FF_ALLOCZ_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW*2+78, 16) * 2, fail);
 
     c->srcBpc = 1 + desc_src->comp[0].depth_minus1;
     if (c->srcBpc < 8)