1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Michael Niedermayer 51fd962c0b 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>
2014-04-04 23:40:08 +02:00
..
2014-03-17 00:48:09 +01:00
2014-02-24 08:30:19 +01:00
2014-04-04 04:00:11 +02:00
2014-03-22 14:07:03 +01:00
2014-03-29 18:13:15 +01:00
2014-03-29 18:13:15 +01:00