Merge commit '7288b345850792430302a8f85a4b29140b770497'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 18:48:05 +0000 (20:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 18:48:05 +0000 (20:48 +0200)
* commit '7288b345850792430302a8f85a4b29140b770497':
  fft-test: Drop unnecessary pointer indirection for context structs

Conflicts:
libavcodec/fft-test.c

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

@@@ -320,19 -313,19 +319,19 @@@ int main(int argc, char **argv
              av_log(NULL, AV_LOG_INFO,"IDFT_C2R");
          else
              av_log(NULL, AV_LOG_INFO,"DFT_R2C");
-         ff_rdft_init(r, fft_nbits, do_inverse ? IDFT_C2R : DFT_R2C);
+         ff_rdft_init(&r, fft_nbits, do_inverse ? IDFT_C2R : DFT_R2C);
          fft_ref_init(fft_nbits, do_inverse);
          break;
 -#endif /* CONFIG_RDFT */
 -#if CONFIG_DCT
 +#    endif /* CONFIG_RDFT */
 +#    if CONFIG_DCT
      case TRANSFORM_DCT:
          if (do_inverse)
              av_log(NULL, AV_LOG_INFO,"DCT_III");
          else
              av_log(NULL, AV_LOG_INFO,"DCT_II");
-         ff_dct_init(d, fft_nbits, do_inverse ? DCT_III : DCT_II);
+         ff_dct_init(&d, fft_nbits, do_inverse ? DCT_III : DCT_II);
          break;
 -#endif /* CONFIG_DCT */
 +#    endif /* CONFIG_DCT */
  #endif /* FFT_FLOAT */
      default:
          av_log(NULL, AV_LOG_ERROR, "Requested transform not supported\n");
  #if CONFIG_DCT
      case TRANSFORM_DCT:
          memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
-         d->dct_calc(d, (FFTSample *)tab);
 -        d.dct_calc(&d, tab);
++        d.dct_calc(&d, (FFTSample *)tab);
          if (do_inverse) {
 -            idct_ref(tab_ref, tab1, fft_nbits);
 +            idct_ref((FFTSample*)tab_ref, (FFTSample *)tab1, fft_nbits);
          } else {
 -            dct_ref(tab_ref, tab1, fft_nbits);
 +            dct_ref((FFTSample*)tab_ref, (FFTSample *)tab1, fft_nbits);
          }
          err = check_diff((float *)tab_ref, (float *)tab, fft_size, 1.0);
          break;
          break;
  #endif /* CONFIG_MDCT */
      case TRANSFORM_FFT:
-         ff_fft_end(s);
+         ff_fft_end(&s);
          break;
  #if FFT_FLOAT
 -#if CONFIG_RDFT
 +#    if CONFIG_RDFT
      case TRANSFORM_RDFT:
-         ff_rdft_end(r);
+         ff_rdft_end(&r);
          break;
 -#endif /* CONFIG_RDFT */
 -#if CONFIG_DCT
 +#    endif /* CONFIG_RDFT */
 +#    if CONFIG_DCT
      case TRANSFORM_DCT:
-         ff_dct_end(d);
+         ff_dct_end(&d);
          break;
 -#endif /* CONFIG_DCT */
 +#    endif /* CONFIG_DCT */
  #endif /* FFT_FLOAT */
      }