diff options
| author | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-24 21:27:50 +0000 |
|---|---|---|
| committer | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-24 21:27:50 +0000 |
| commit | 998eb2c1c9c97efe301c69b7173627a3d7563a58 (patch) | |
| tree | 4d7444a04130e762c6a4ea38d814516180cce260 /libvo | |
| parent | a768debb4bee73e134bc0654870f73c247b7deea (diff) | |
| download | mpv-998eb2c1c9c97efe301c69b7173627a3d7563a58.tar.bz2 mpv-998eb2c1c9c97efe301c69b7173627a3d7563a58.tar.xz | |
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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7903 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/jpeg_enc.c | 6 | ||||
| -rw-r--r-- | libvo/jpeg_enc.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index bffae9f3ac..3727aa28ca 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -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 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], * 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 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], /* (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 { diff --git a/libvo/jpeg_enc.h b/libvo/jpeg_enc.h index 43972d0835..27f1af6033 100644 --- a/libvo/jpeg_enc.h +++ b/libvo/jpeg_enc.h @@ -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 |