aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dsputil.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-12-14 02:57:00 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-12-14 02:57:00 +0000
commitd50635cd247e17fe16c63219b9ae80d45a8185b1 (patch)
tree065f1c843757fa4f372a08d515de73b788681bba /libavcodec/dsputil.c
parent7ebfc0ea630e38a9c9653cdc9fe46f8b00e915a9 (diff)
downloadffmpeg-d50635cd247e17fe16c63219b9ae80d45a8185b1.tar.gz
split intra / inter dequantization
Originally committed as revision 2607 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r--libavcodec/dsputil.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 766a350ab3..e516d7ee99 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2766,7 +2766,7 @@ static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *s
memcpy(bak, temp, 64*sizeof(DCTELEM));
s->block_last_index[0/*FIXME*/]= s->fast_dct_quantize(s, temp, 0/*FIXME*/, s->qscale, &i);
- s->dct_unquantize(s, temp, 0, s->qscale);
+ s->dct_unquantize_inter(s, temp, 0, s->qscale);
simple_idct(temp); //FIXME
for(i=0; i<64; i++)
@@ -2839,7 +2839,10 @@ static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int
}
if(last>=0){
- s->dct_unquantize(s, temp, 0, s->qscale);
+ if(s->mb_intra)
+ s->dct_unquantize_intra(s, temp, 0, s->qscale);
+ else
+ s->dct_unquantize_inter(s, temp, 0, s->qscale);
}
s->dsp.idct_add(bak, stride, temp);