diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-24 01:50:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-24 01:50:01 +0200 |
| commit | ab0f78ea77779e9f87015910ef235b6d1e6d2ccb (patch) | |
| tree | 084a833ebcd040ff3409899bd22d7460d190b6ba /libavcodec | |
| parent | 02ea384abd8ef53a1e4654ab0c9e72e08141d751 (diff) | |
| parent | d0de7330b973b354e2ceb0b99fd545b868b0a9c4 (diff) | |
| download | ffmpeg-ab0f78ea77779e9f87015910ef235b6d1e6d2ccb.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/fft-test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c index 6b745cb21c..1dbd271271 100644 --- a/libavcodec/fft-test.c +++ b/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 */ |