mxf: Support AAC

[ffmpeg] / libavcodec / idctdsp.c

diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c
index 9651c2cb69d1d0acae580ff3175fb7087cd8bbd3..6beb2b2acc020a1904deccf274377a64b7b1547d 100644 (file)
--- a/libavcodec/idctdsp.c
+++ b/libavcodec/idctdsp.c
@@ -158,27 +158,25 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
     const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8;
 
     if (avctx->bits_per_raw_sample == 10) {
-        c->idct_put              = ff_simple_idct_put_10;
-        c->idct_add              = ff_simple_idct_add_10;
-        c->idct                  = ff_simple_idct_10;
-        c->perm_type             = FF_IDCT_PERM_NONE;
-    } else {
-        if (avctx->idct_algo == FF_IDCT_INT) {
-            c->idct_put              = jref_idct_put;
-            c->idct_add              = jref_idct_add;
-            c->idct                  = ff_j_rev_dct;
-            c->perm_type             = FF_IDCT_PERM_LIBMPEG2;
-        } else if (avctx->idct_algo == FF_IDCT_FAAN) {
-            c->idct_put              = ff_faanidct_put;
-            c->idct_add              = ff_faanidct_add;
-            c->idct                  = ff_faanidct;
-            c->perm_type             = FF_IDCT_PERM_NONE;
-        } else { // accurate/default
-            c->idct_put              = ff_simple_idct_put_8;
-            c->idct_add              = ff_simple_idct_add_8;
-            c->idct                  = ff_simple_idct_8;
-            c->perm_type             = FF_IDCT_PERM_NONE;
-        }
+        c->idct_put  = ff_simple_idct_put_10;
+        c->idct_add  = ff_simple_idct_add_10;
+        c->idct      = ff_simple_idct_10;
+        c->perm_type = FF_IDCT_PERM_NONE;
+    } else if (avctx->idct_algo == FF_IDCT_INT) {
+        c->idct_put  = jref_idct_put;
+        c->idct_add  = jref_idct_add;
+        c->idct      = ff_j_rev_dct;
+        c->perm_type = FF_IDCT_PERM_LIBMPEG2;
+    } else if (avctx->idct_algo == FF_IDCT_FAAN) {
+        c->idct_put  = ff_faanidct_put;
+        c->idct_add  = ff_faanidct_add;
+        c->idct      = ff_faanidct;
+        c->perm_type = FF_IDCT_PERM_NONE;
+    } else { // accurate/default
+        c->idct_put  = ff_simple_idct_put_8;
+        c->idct_add  = ff_simple_idct_add_8;
+        c->idct      = ff_simple_idct_8;
+        c->perm_type = FF_IDCT_PERM_NONE;
     }
 
     c->put_pixels_clamped        = put_pixels_clamped_c;