Merge commit '6f1960ab71b4f18551243ce22d01913108265233'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 19:53:20 +0000 (21:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 19:53:20 +0000 (21:53 +0200)
* commit '6f1960ab71b4f18551243ce22d01913108265233':
  idct: cosmetics: Drop one unnecessary if-block level

Conflicts:
libavcodec/idctdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/idctdsp.c

@@@ -250,50 -157,26 +250,50 @@@ av_cold void ff_idctdsp_init(IDCTDSPCon
  {
      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;
 +    if (avctx->lowres==1) {
 +        c->idct_put  = ff_jref_idct4_put;
 +        c->idct_add  = ff_jref_idct4_add;
 +        c->idct      = ff_j_rev_dct4;
          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;
 +    } else if (avctx->lowres==2) {
 +        c->idct_put  = ff_jref_idct2_put;
 +        c->idct_add  = ff_jref_idct2_add;
 +        c->idct      = ff_j_rev_dct2;
          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;
 +    } else if (avctx->lowres==3) {
 +        c->idct_put  = ff_jref_idct1_put;
 +        c->idct_add  = ff_jref_idct1_add;
 +        c->idct      = ff_j_rev_dct1;
          c->perm_type = FF_IDCT_PERM_NONE;
-         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->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->bits_per_raw_sample == 12) {
 +            c->idct_put              = ff_simple_idct_put_12;
 +            c->idct_add              = ff_simple_idct_add_12;
 +            c->idct                  = ff_simple_idct_12;
 +            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;