Changeset a6657044 in ffmpeg

Timestamp:

Oct 26, 2013, 12:36:36 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8c508a03

Parents:

865b70b (diff), 4d6ee07 (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> (10/26/13 00:36:20)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/26/13 00:36:36)

Message:

Merge commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4'

• commit '4d6ee0725553a43ba88d6f8327ebcf8f1c5ae8d4': libavutil: x86: Add AVX2 capable CPU detection.

Conflicts:

libavutil/cpu.c
libavutil/cpu.h
libavutil/x86/cpu.c

See: 865b70bc5d1cf37ec6d6cb729a69dda2cca28bd5
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)