Changeset baf3adc6 in ffmpeg

Timestamp:

Feb 28, 2014, 7:38:39 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

747b033

Parents:

2cdbcc00 (diff), 08e3ea6 (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> (02/28/14 19:38:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/28/14 19:38:39)

Message:

Merge commit '08e3ea60ff4059341b74be04a428a38f7c3630b0'

• commit '08e3ea60ff4059341b74be04a428a38f7c3630b0': x86: synth filter float: implement SSE2 version

Conflicts:

libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c

See: 2cdbcc004837ce092a14f326f24d97a29512a2c3
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)