d3d11va: make av_d3d11va_alloc_context() available at all times

[ffmpeg] / libavcodec / fdctdsp.c

diff --git a/libavcodec/fdctdsp.c b/libavcodec/fdctdsp.c
index b245198b90340a93afe8ca1695b8262f2742c8d6..f299eae27228e4932a1f8a07c247134130518902 100644 (file)
--- a/libavcodec/fdctdsp.c
+++ b/libavcodec/fdctdsp.c
@@ -30,17 +30,17 @@ av_cold void ff_fdctdsp_init(FDCTDSPContext *c, AVCodecContext *avctx)
     if (avctx->bits_per_raw_sample == 10) {
         c->fdct    = ff_jpeg_fdct_islow_10;
         c->fdct248 = ff_fdct248_islow_10;
+    } else if (avctx->dct_algo == FF_DCT_FASTINT) {
+        c->fdct    = ff_fdct_ifast;
+        c->fdct248 = ff_fdct_ifast248;
+#if CONFIG_FAANDCT
+    } else if (avctx->dct_algo == FF_DCT_FAAN) {
+        c->fdct    = ff_faandct;
+        c->fdct248 = ff_faandct248;
+#endif /* CONFIG_FAANDCT */
     } else {
-        if (avctx->dct_algo == FF_DCT_FASTINT) {
-            c->fdct    = ff_fdct_ifast;
-            c->fdct248 = ff_fdct_ifast248;
-        } else if (avctx->dct_algo == FF_DCT_FAAN) {
-            c->fdct    = ff_faandct;
-            c->fdct248 = ff_faandct248;
-        } else {
-            c->fdct    = ff_jpeg_fdct_islow_8; // slow/accurate/default
-            c->fdct248 = ff_fdct248_islow_8;
-        }
+        c->fdct    = ff_jpeg_fdct_islow_8; // slow/accurate/default
+        c->fdct248 = ff_fdct248_islow_8;
     }
 
     if (ARCH_PPC)