[MPlayer-dev-eng] non-free and undistributable files in tremor/
Uoti Urpala
uoti.urpala at pp1.inet.fi
Sun Jul 30 03:22:57 CEST 2006
> You can get all those files with a correct bsd license header from
> tremor svn (http://svn.xiph.org/trunk/Tremor) by checking out r3895.
> The previous version r3890 contains the same files with the bad license
> header.
It's better to use r3989, because a word in the file 'COPYING' which the
headers refer to changed in that revision. The version after that date
has the same COPYING as is currently in MPlayer.
> Except from the headers the only difference between our files and the
> ones from r3895 is in sharedbook.c
>
> @@ -208,7 +211,7 @@
> int indexdiv=1;
> for(k=0;k<b->dim;k++){
> int index= (j/indexdiv)%quantvals;
> - ogg_int32_t point;
> + int point;
> int val=VFLOAT_MULTI(delta,delpoint,
> abs(b->quantlist[index]),&point);
>
> @@ -242,7 +245,7 @@
> int lastpoint=0;
>
> for(k=0;k<b->dim;k++){
> - ogg_int32_t point;
> + int point;
> int val=VFLOAT_MULTI(delta,delpoint,
> abs(b->quantlist[j*b->dim+k]),&point);
>
>
> We probably have to commit also this change to be on the safe side.
There's one extra change to sharedbook.c in r3989:
@@ -313,7 +316,8 @@
}
static int sort32a(const void *a,const void *b){
- return ( (**(ogg_uint32_t **)a>**(ogg_uint32_t **)b)<<1)-1;
+ return (**(ogg_uint32_t **)a>**(ogg_uint32_t **)b)-
+ (**(ogg_uint32_t **)a<**(ogg_uint32_t **)b);
}
This had the commit comment "correct sort32a in sharedbook.c". Hopefully
it's safe.
More information about the MPlayer-dev-eng
mailing list