diff options
| author | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-12 17:11:34 +0000 |
|---|---|---|
| committer | rik <rik@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-12 17:11:34 +0000 |
| commit | fccc626a74cc9a709bcc06427e725f60400c49ce (patch) | |
| tree | 7fac06c44302147e88d88d72518d7c0aaeef68bc /libvo | |
| parent | d1e9beb0ae81af4dd04d2ed007222bfbc23b1e2b (diff) | |
| download | mpv-fccc626a74cc9a709bcc06427e725f60400c49ce.tar.bz2 mpv-fccc626a74cc9a709bcc06427e725f60400c49ce.tar.xz | |
libavcodec sync
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9574 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/jpeg_enc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c index 76d7247e3e..2d8e230618 100644 --- a/libvo/jpeg_enc.c +++ b/libvo/jpeg_enc.c @@ -81,9 +81,9 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], for(qscale=1; qscale<32; qscale++){ int i; - if (s->fdct == ff_jpeg_fdct_islow) { + if (s->dsp.fdct == ff_jpeg_fdct_islow) { for (i = 0; i < 64; i++) { - const int j = s->idct_permutation[i]; + const int j = s->dsp.idct_permutation[i]; /* 16 <= qscale * quant_matrix[i] <= 7905 * 19952 <= aanscales[i] * \ * qscale * quant_matrix[i] <= 205026 @@ -94,9 +94,9 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], qmat[qscale][i] = (int)((UINT64_C(1) << (QMAT_SHIFT-3))/ (qscale * quant_matrix[j])); } - } else if (s->fdct == fdct_ifast) { + } else if (s->dsp.fdct == fdct_ifast) { for(i=0;i<64;i++) { - const int j = s->idct_permutation[i]; + const int j = s->dsp.idct_permutation[i]; /* 16 <= qscale * quant_matrix[i] <= 7905 */ /* 19952 <= aanscales[i] * qscale * quant_matrix[i] <= 249205026 */ /* (1<<36)/19952 >= (1<<36)/(aanscales[i] * qscale * quant_matrix[i]) >= (1<<36)/249205026 */ @@ -107,7 +107,7 @@ static void convert_matrix(MpegEncContext *s, int (*qmat)[64], } } else { for(i=0;i<64;i++) { - const int j = s->idct_permutation[i]; + const int j = s->dsp.idct_permutation[i]; /* We can safely suppose that 16 <= quant_matrix[i] <= 255 So 16 <= qscale * quant_matrix[i] <= 7905 so (1<<19) / 16 >= (1<<19) / (qscale * quant_matrix[i]) >= (1<<19) / 7905 |