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 /libavformat/internal.h | |
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 'libavformat/internal.h')
0 files changed, 0 insertions, 0 deletions