Make code using 1d-DCT consistent with the API change

Originally committed as revision 22792 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2010-04-03 15:04:15 +00:00
parent 2874c81cc8
commit c2b774a04e
2 changed files with 4 additions and 4 deletions

View File

@ -127,7 +127,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT) if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT)
ff_rdft_init(&s->trans.rdft, frame_len_bits, DFT_C2R); ff_rdft_init(&s->trans.rdft, frame_len_bits, DFT_C2R);
else if (CONFIG_BINKAUDIO_DCT_DECODER) else if (CONFIG_BINKAUDIO_DCT_DECODER)
ff_dct_init(&s->trans.dct, frame_len_bits, 1); ff_dct_init(&s->trans.dct, frame_len_bits, DCT_III);
else else
return -1; return -1;

View File

@ -300,10 +300,10 @@ int main(int argc, char **argv)
break; break;
case TRANSFORM_DCT: case TRANSFORM_DCT:
if (do_inverse) if (do_inverse)
av_log(NULL, AV_LOG_INFO,"IDCT"); av_log(NULL, AV_LOG_INFO,"DCT_III");
else else
av_log(NULL, AV_LOG_INFO,"DCT"); av_log(NULL, AV_LOG_INFO,"DCT_II");
ff_dct_init(d, fft_nbits, do_inverse); ff_dct_init(d, fft_nbits, do_inverse ? DCT_III : DCT_II);
break; break;
} }
av_log(NULL, AV_LOG_INFO," %d test\n", fft_size); av_log(NULL, AV_LOG_INFO," %d test\n", fft_size);