[Mplayer-cvslog] CVS: main/libvo jpeg_enc.c,1.10,1.11 jpeg_enc.h,1.1,1.2

[Rik Snel CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv10349

Modified Files:
	jpeg_enc.c jpeg_enc.h 
Log Message:
sync with libavcodec for unaccellerated dcts (sorry Felix, LIBAVCODEC_BUILD did not change, so also no backwards compatibility this time), and a long overdue copyright update

Index: jpeg_enc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jpeg_enc.c	30 Sep 2002 21:46:54 -0000	1.10
+++ jpeg_enc.c	24 Oct 2002 21:27:50 -0000	1.11
@@ -2,7 +2,7 @@
  * based on mjpeg code from ffmpeg. 
  *
  * Copyright (c) 2002, Rik Snel
- * Parts from ffmpeg Copyright (c) 2000, 2001 Gerard Lantau
+ * Parts from ffmpeg Copyright (c) 2000-2002 Fabrice Bellard
  *
  * 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
@@ -91,7 +91,7 @@
 			 * 	qscale * quant_matrix[i]) >= (1<<36)/249205025
 			 * 3444240       >= (1<<36)/(aanscales[i] *
 			 *      qscale * quant_matrix[i]) >= 275              */
-			qmat[qscale][j] = (int)((UINT64_C(1) << (QMAT_SHIFT-3))/
+			qmat[qscale][i] = (int)((UINT64_C(1) << (QMAT_SHIFT-3))/
 					(qscale * quant_matrix[j]));
 		}
 	} else if (s->fdct == fdct_ifast) {
@@ -102,7 +102,7 @@
                 /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */
                 /* 3444240       >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= 275 */
                 
-                qmat[qscale][j] = (int)((UINT64_C(1) << (QMAT_SHIFT + 11)) / 
+                qmat[qscale][i] = (int)((UINT64_C(1) << (QMAT_SHIFT + 11)) / 
                                 (aanscales[i] * qscale * quant_matrix[j]));
             }
         } else {

Index: jpeg_enc.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/jpeg_enc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jpeg_enc.h	11 Feb 2002 01:24:56 -0000	1.1
+++ jpeg_enc.h	24 Oct 2002 21:27:50 -0000	1.2
@@ -2,7 +2,7 @@
  * based on mjpeg code from ffmpeg. 
  *
  * Copyright (c) 2002, Rik Snel
- * Parts from ffmpeg Copyright (c) 2000, 2001 Gerard Lantau
+ * Parts from ffmpeg Copyright (c) 2000-2002 Fabrice Bellard
  *
  * 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