[Mplayer-cvslog] CVS: main/postproc swscale.c,1.56,1.57 swscale_template.c,1.59,1.60 swscale.h,1.8,1.9

[Michael Niedermayer]

Update of /cvsroot/mplayer/main/postproc
In directory mplayer:/var/tmp.root/cvs-serv3111

Modified Files:
	swscale.c swscale_template.c swscale.h 
Log Message:
copyright(swscaler) = GPL


Index: swscale.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- swscale.c	21 Jan 2002 15:22:28 -0000	1.56
+++ swscale.c	21 Jan 2002 18:32:31 -0000	1.57
@@ -1,9 +1,20 @@
+/*
+    Copyright (C) 2001-2002 Michael Niedermayer <michaelni at gmx.at>
 
-// Software scaling and colorspace conversion routines for MPlayer
-
-// Orginal C implementation by A'rpi/ESP-team <arpi at thot.banki.hu>
-// current version mostly by Michael Niedermayer (michaelni at gmx.at)
-// the parts written by michael are under GNU GPL
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
 
 /*
   supported Input formats: YV12 (grayscale soon too)
@@ -469,10 +480,10 @@
 		flags= SWS_PRINT_INFO;
 		firstTime=0;
 
-		if(src_filter.lumH) free(src_filter.lumH);
-		if(src_filter.lumV) free(src_filter.lumV);
-		if(src_filter.chrH) free(src_filter.chrH);
-		if(src_filter.chrV) free(src_filter.chrV);
+		if(src_filter.lumH) freeVec(src_filter.lumH);
+		if(src_filter.lumV) freeVec(src_filter.lumV);
+		if(src_filter.chrH) freeVec(src_filter.chrH);
+		if(src_filter.chrV) freeVec(src_filter.chrV);
 
 		if(sws_lum_gblur!=0.0){
 			src_filter.lumH= getGaussianVec(sws_lum_gblur, 3.0);

Index: swscale_template.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale_template.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- swscale_template.c	21 Jan 2002 03:56:47 -0000	1.59
+++ swscale_template.c	21 Jan 2002 18:32:31 -0000	1.60
@@ -1,9 +1,20 @@
+/*
+    Copyright (C) 2001-2002 Michael Niedermayer <michaelni at gmx.at>
 
-// Software scaling and colorspace conversion routines for MPlayer
-
-// Orginal C implementation by A'rpi/ESP-team <arpi at thot.banki.hu>
-// current version mostly by Michael Niedermayer (michaelni at gmx.at)
-// the parts written by michael are under GNU GPL
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
 
 #undef MOVNTQ
 #undef PAVGB
@@ -1885,7 +1896,7 @@
 	const int chrDstW= c->chrDstW;
 	const int lumXInc= c->lumXInc;
 	const int chrXInc= c->chrXInc;
-	const int dstFormat= c->dstFormat; //FIXME serach for dstbpp;
+	const int dstFormat= c->dstFormat;
 	const int flags= c->flags;
 	const int canMMX2BeUsed= c->canMMX2BeUsed;
 	int16_t *vLumFilterPos= c->vLumFilterPos;

Index: swscale.h
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- swscale.h	21 Jan 2002 15:22:28 -0000	1.8
+++ swscale.h	21 Jan 2002 18:32:31 -0000	1.9
@@ -1,3 +1,20 @@
+/*
+    Copyright (C) 2001-2002 Michael Niedermayer <michaelni at gmx.at>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
 
 /* values for the flags, the stuff on the command line is different */
 #define SWS_FAST_BILINEAR 1