On Fri, May 27, 2011 at 12:23:07PM -0400, Ronald S. Bultje wrote: > Hi, > > On Fri, May 27, 2011 at 12:11 PM, Kostya <[email protected]> wrote: > > On Fri, May 27, 2011 at 11:54:12AM -0400, Ronald S. Bultje wrote: > >> That means it won't be allocated when not needed. Alongside > >> this, it may fix valgrind/fate-detected memory leaks. > >> --- > >> libswscale/utils.c | 2 +- > >> 1 files changed, 1 insertions(+), 1 deletions(-) > >> > >> diff --git a/libswscale/utils.c b/libswscale/utils.c > >> index 15ed9d1..571f45b 100644 > >> --- a/libswscale/utils.c > >> +++ b/libswscale/utils.c > >> @@ -791,7 +791,6 @@ int sws_init_context(SwsContext *c, SwsFilter > >> *srcFilter, SwsFilter *dstFilter) > >> srcW, srcH, dstW, dstH); > >> return AVERROR(EINVAL); > >> } > >> - FF_ALLOC_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW, 16) * 2, fail); > >> > >> if (!dstFilter) dstFilter= &dummyFilter; > >> if (!srcFilter) srcFilter= &dummyFilter; > >> @@ -847,6 +846,7 @@ int sws_init_context(SwsContext *c, SwsFilter > >> *srcFilter, SwsFilter *dstFilter) > >> } > >> } > >> > >> + FF_ALLOC_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW, 16) * 2, fail); > >> if (HAVE_MMX2 && cpu_flags & AV_CPU_FLAG_MMX2) { > >> c->canMMX2BeUsed= (dstW >=srcW && (dstW&31)==0 && (srcW&15)==0) ? > >> 1 : 0; > >> if (!c->canMMX2BeUsed && dstW >=srcW && (srcW&15)==0 && > >> (flags&SWS_FAST_BILINEAR)) { > > > > Why not try it under valgrind (they you won't have to write "may fix")? > > Trying to scale 4x4 input should trigger the condition (I think). > > It fixes the one I was looking at. I'll rewrite the log message to say > "fixes". OK then?
ok _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
