[FFmpeg-devel] [PATCH] swscale C code and the GPL

[Michael Niedermayer]

On Fri, Jun 26, 2009 at 01:01:15AM +0200, Diego Biurrun wrote:
> On Thu, Jun 25, 2009 at 10:53:55PM +0200, Michael Niedermayer wrote:
> > On Thu, Jun 25, 2009 at 10:06:13PM +0200, Diego Biurrun wrote:
> > > On Thu, Jun 25, 2009 at 07:50:15PM +0200, Michael Niedermayer wrote:
> > > > On Thu, Jun 25, 2009 at 05:16:59PM +0200, Diego Biurrun wrote:
> > > > > Here is a patch that fixes a false dependency of the C code in swscale
> > > > > on the GPL.  I'm not 100% sure about the last hunk, the rest should be
> > > > > correct.
> > > > > 
> > > > >  swscale.c |   10 +++++-----
> > > > >  1 file changed, 5 insertions(+), 5 deletions(-)
> > > > > 063e24e6798072a6a3955b963e820e1dc5583f77  swscale_gpl.diff
> > > 
> > > Where did this come from, it's not in my patch..
> > 
> > magic :)
> 
> Teach me :)

put the following 2 in ~/.mailcap
text/x-patch;                   (diffstat %s \; sha1sum %s | sed 's#/tmp/##' \; cat %s); copiousoutput
text/x-diff;                    (diffstat %s \; sha1sum %s | sed 's#/tmp/##' \; cat %s); copiousoutput

btw, theres one thing that puzzles me
mutts README.SECURITY says
-------
>>>          KEEP THE %-EXPANDOS AWAY FROM SHELL QUOTING.

Don't quote them with single or double quotes.  Mutt does this for
you, the right way, as should any other program which interprets
mailcap.  Don't put them into backtick expansions - as you have seen
above, this is a recipe for disaster.  Be highly careful with eval
statements, and avoid them if possible at all.
-------

it puzzles me because debians /etc/mailcap quotes the % stuff all over the
place ...



> 
> > > > > @@ -1972,10 +1972,10 @@
> > > > >  
> > > > >  static SwsFunc getSwsFunc(SwsContext *c)
> > > > >  {
> > > > > -#if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL
> > > > > +#if CONFIG_RUNTIME_CPUDETECT
> > > > >      int flags = c->flags;
> > > > >  
> > > > > -#if ARCH_X86
> > > > > +#if ARCH_X86 && CONFIG_GPL
> > > > >      // ordered per speed fastest first
> > > > >      if (flags & SWS_CPU_CAPS_MMX2) {
> > > > >          sws_init_swScale_MMX2(c);
> > > > 
> > > > redundant
> > > 
> > > I beg to differ.  Without the CONFIG_GPL, x86 optimizations would get
> > > enabled.
> > 
> > I really doubt that CONFIG_GPL can be false in a
> > #if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL
> > making the second check redundant
> 
> I change it from
> 
>   #if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL
> 
> to
> 
>   #if CONFIG_RUNTIME_CPUDETECT
> 
> So the CONFIG_GPL gets moved, not added.

i guess the + and - where flipped here due to radiation from
satelite debris again ;)

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Thouse who are best at talking, realize last or never when they are wrong.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090626/e6f7850d/attachment.pgp>