1. ffmpeg
  2. Commit 389e2000ebc299b9da24f7e5faf9a68a88f9ee7c
Browse code

swscale: delay allocation of formatConvBuffer().

That means it won't be allocated when not needed. Alongside
this, it fixes valgrind/fate-detected memory leaks.

Ronald S. Bultje authored on 2011/05/28 01:23:32
Showing 1 changed files
libswscale/utils.c
History View file @ 389e200
... ... 
@@ -791,7 +791,6 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
791 791 
                srcW, srcH, dstW, dstH);
792 792 
         return AVERROR(EINVAL);
793 793 
     }
794 
-    FF_ALLOC_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW, 16) * 2, fail);
795 794
796 795 
     if (!dstFilter) dstFilter= &dummyFilter;
797 796 
     if (!srcFilter) srcFilter= &dummyFilter;
... ... 
@@ -847,6 +846,7 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
847 847 
         }
848 848 
     }
849 849
850 
+    FF_ALLOC_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW, 16) * 2, fail);
850 851 
     if (HAVE_MMX2 && cpu_flags & AV_CPU_FLAG_MMX2) {
851 852 
         c->canMMX2BeUsed= (dstW >=srcW && (dstW&31)==0 && (srcW&15)==0) ? 1 : 0;
852 853 
         if (!c->canMMX2BeUsed && dstW >=srcW && (srcW&15)==0 && (flags&SWS_FAST_BILINEAR)) {