Merge commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4'

* commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4':
  fft-test: Pass correct struct members to (i)dct functions

Conflicts:
	libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/fft-test.c

@@ -426,11 +426,11 @@ int main(int argc, char **argv)
 #if CONFIG_DCT
     case TRANSFORM_DCT:
         memcpy(tab, tab1, fft_size * sizeof(FFTComplex));
-        d.dct_calc(&d, (FFTSample *)tab);
+        d.dct_calc(&d, &tab->re);
         if (do_inverse)
-            idct_ref((FFTSample*)tab_ref, (FFTSample *)tab1, fft_nbits);
+            idct_ref(&tab_ref->re, &tab1->re, fft_nbits);
         else
-            dct_ref((FFTSample*)tab_ref, (FFTSample *)tab1, fft_nbits);
+            dct_ref(&tab_ref->re, &tab1->re, fft_nbits);
         err = check_diff((float *) tab_ref, (float *) tab, fft_size, 1.0);
         break;
 #endif /* CONFIG_DCT */