diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 19:22:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 19:22:00 +0100 |
| commit | e346a5938317f40410b8f267799f4e2707cf575a (patch) | |
| tree | 7be30f53b67716525658761eea3e6451b6299c8b /libavfilter/af_amerge.c | |
| parent | 169243112c1e310d90c030fb258092f6d2e46117 (diff) | |
| parent | ad507d7907457e678900bac132122ba7be4644cb (diff) | |
| download | ffmpeg-e346a5938317f40410b8f267799f4e2707cf575a.tar.gz | |
Merge commit 'ad507d7907457e678900bac132122ba7be4644cb'
* commit 'ad507d7907457e678900bac132122ba7be4644cb':
x86: dcadsp: implement SSE lfe_dir
Conflicts:
libavcodec/x86/dcadsp.asm
See: 169243112c1e310d90c030fb258092f6d2e46117
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amerge.c')
0 files changed, 0 insertions, 0 deletions