Mercurial > mplayer.hg
changeset 7902:c9d1054aa359
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
| author | rik |
|---|---|
| date | Thu, 24 Oct 2002 21:27:50 +0000 |
| parents | 80e1aa85bac4 |
| children | 5b9707780f3d |
| files | libvo/jpeg_enc.c libvo/jpeg_enc.h |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/jpeg_enc.c Thu Oct 24 21:05:16 2002 +0000 +++ b/libvo/jpeg_enc.c Thu Oct 24 21:27:50 2002 +0000 @@ -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 {
--- a/libvo/jpeg_enc.h Thu Oct 24 21:05:16 2002 +0000 +++ b/libvo/jpeg_enc.h Thu Oct 24 21:27:50 2002 +0000 @@ -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