aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2010-04-03 15:04:15 +0000
committerVitor Sessak <vitor1001@gmail.com>2010-04-03 15:04:15 +0000
commitc2b774a04eabc115386ebf06f57a55582a50b5c3 (patch)
tree1d7a3c22f780b67019148c9e75225732d6c47249
parent2874c81cc80b7f1005073748e8f1877055bf97a7 (diff)
downloadffmpeg-c2b774a04eabc115386ebf06f57a55582a50b5c3.tar.gz
Make code using 1d-DCT consistent with the API change
Originally committed as revision 22792 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/binkaudio.c2
-rw-r--r--libavcodec/fft-test.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index ff2906077a..f887f9e6c4 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -127,7 +127,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT)
ff_rdft_init(&s->trans.rdft, frame_len_bits, DFT_C2R);
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
return -1;
diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c
index db55b6033d..5170b26b19 100644
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c
@@ -300,10 +300,10 @@ int main(int argc, char **argv)
break;
case TRANSFORM_DCT:
if (do_inverse)
- av_log(NULL, AV_LOG_INFO,"IDCT");
+ av_log(NULL, AV_LOG_INFO,"DCT_III");
else
- av_log(NULL, AV_LOG_INFO,"DCT");
- ff_dct_init(d, fft_nbits, do_inverse);
+ av_log(NULL, AV_LOG_INFO,"DCT_II");
+ ff_dct_init(d, fft_nbits, do_inverse ? DCT_III : DCT_II);
break;
}
av_log(NULL, AV_LOG_INFO," %d test\n", fft_size);