Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 22:29:06 +0000 (00:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 22:29:06 +0000 (00:29 +0200)
* commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc':
  fft-test: Comment some #endifs

Conflicts:
libavcodec/fft-test.c

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

@@@ -349,8 -343,8 +349,8 @@@ int main(int argc, char **argv
              av_log(NULL, AV_LOG_INFO,"DCT_II");
          ff_dct_init(d, fft_nbits, do_inverse ? DCT_III : DCT_II);
          break;
 -#endif /* CONFIG_DCT */
 +#    endif /* CONFIG_DCT */
- #endif
+ #endif /* FFT_FLOAT */
      default:
          av_log(NULL, AV_LOG_ERROR, "Requested transform not supported\n");
          return 1;
                      memcpy(tab2, tab1, fft_size * sizeof(FFTSample));
                      d->dct_calc(d, tab2);
                      break;
- #endif
+ #endif /* FFT_FLOAT */
                  }
              }
 -            duration = av_gettime() - time_start;
 +            duration = av_gettime_relative() - time_start;
              if (duration >= 1000000)
                  break;
              nb_its *= 2;
      case TRANSFORM_DCT:
          ff_dct_end(d);
          break;
 -#endif /* CONFIG_DCT */
 +#    endif /* CONFIG_DCT */
- #endif
+ #endif /* FFT_FLOAT */
      }
  
      av_free(tab);