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

Originally committed as revision 22792 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index ff29060..f887f9e 100644 (file)
--- 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 db55b60..5170b26 100644 (file)
--- 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);