diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 23:38:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-04 23:40:08 +0200 |
| commit | 51fd962c0bbfab9a4e4d91364a33576e942dcf54 (patch) | |
| tree | a7d0eec09c0a84bca254da28d1747fc64cca1c0b /libavcodec/mss3.c | |
| parent | b00f6bb90a675f4e71f1b1ff4edabc74ff6b692d (diff) | |
| parent | c74b86699c86bdf62e8570f41d8a38be5710baa3 (diff) | |
| download | ffmpeg-51fd962c0bbfab9a4e4d91364a33576e942dcf54.tar.gz | |
Merge commit 'c74b86699c86bdf62e8570f41d8a38be5710baa3'
* commit 'c74b86699c86bdf62e8570f41d8a38be5710baa3':
x86/synth_filter: add synth_filter_fma3
x86/synth_filter: add synth_filter_avx
x86/synth_filter: add synth_filter_sse
Conflicts:
libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c
See: 64672098361361cd15d37e36f747ab44de5b80ca
See: 68c3ed936a76c3ff7738f602fa90237ac7e3ce08
See: 7fd64e3e36f79204c0eda7cacce6884c14ddc1fb
See: aa1f38015cb0d04a5c50a8957dd7aba79f0d8882
See: dfd865e51b890d9be394804bccddf55198f4a251
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss3.c')
0 files changed, 0 insertions, 0 deletions