[FFmpeg-cvslog] idct: cosmetics: Drop one unnecessary if-block level

Diego Biurrun git at videolan.org
Fri Aug 8 22:00:29 CEST 2014


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Aug  7 15:04:39 2014 -0700| [6f1960ab71b4f18551243ce22d01913108265233] | committer: Diego Biurrun

idct: cosmetics: Drop one unnecessary if-block level

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f1960ab71b4f18551243ce22d01913108265233
---

 libavcodec/idctdsp.c |   32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c
index 9dbeba1..6beb2b2 100644
--- a/libavcodec/idctdsp.c
+++ b/libavcodec/idctdsp.c
@@ -162,23 +162,21 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
         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;
-        }
+    } 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;



More information about the ffmpeg-cvslog mailing list