Changeset 51fd962c in ffmpeg

Timestamp:

Apr 4, 2014, 9:40:08 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

490d53e3

Parents:

b00f6bb9 (diff), c74b8669 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/04/14 21:38:00)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/04/14 21:40:08)

Message:

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>

(No files)