[FFmpeg-cvslog] r18975 - trunk/libavcodec/bfin/dsputil_bfin.c

[mru]

Author: mru
Date: Fri May 29 00:35:58 2009
New Revision: 18975

Log:
blackfin: use optimised (I)DCT only when ctx->(i)dct_algo is auto

Modified:
   trunk/libavcodec/bfin/dsputil_bfin.c

Modified: trunk/libavcodec/bfin/dsputil_bfin.c
==============================================================================
--- trunk/libavcodec/bfin/dsputil_bfin.c	Fri May 29 00:35:56 2009	(r18974)
+++ trunk/libavcodec/bfin/dsputil_bfin.c	Fri May 29 00:35:58 2009	(r18975)
@@ -293,13 +293,16 @@ void dsputil_init_bfin( DSPContext* c, A
     c->put_no_rnd_pixels_tab[0][2] = bfin_put_pixels16_y2_nornd;
     c->put_no_rnd_pixels_tab[0][3] = ff_bfin_put_pixels16_xy2_nornd;
 
-    c->idct_permutation_type = FF_NO_IDCT_PERM;
-    c->fdct                  = ff_bfin_fdct;
+    if (avctx->dct_algo == FF_DCT_AUTO)
+        c->fdct               = ff_bfin_fdct;
+
     if (avctx->idct_algo==FF_IDCT_VP3) {
+        c->idct_permutation_type = FF_NO_IDCT_PERM;
         c->idct               = ff_bfin_vp3_idct;
         c->idct_add           = ff_bfin_vp3_idct_add;
         c->idct_put           = ff_bfin_vp3_idct_put;
-    } else {
+    } else if (avctx->idct_algo == FF_IDCT_AUTO) {
+        c->idct_permutation_type = FF_NO_IDCT_PERM;
         c->idct               = ff_bfin_idct;
         c->idct_add           = bfin_idct_add;
         c->idct_put           = bfin_idct_put;