diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 14:28:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-22 14:28:42 +0200 |
| commit | f903b4266381c5e2f2ba0b6e83a00a1a0b38b163 (patch) | |
| tree | a4eaae3e4f42e81d3fefdb1431170d29f1e9ccef /libavfilter/af_join.c | |
| parent | 7af7b45c3802d3d75981057cfda1e1764e96c4da (diff) | |
| parent | e7b31844f68eb51137740c5eec29b35eb4994004 (diff) | |
| download | ffmpeg-f903b4266381c5e2f2ba0b6e83a00a1a0b38b163.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: Split DCT and FFT initialization into separate files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions