Changeset bd8d73ea in ffmpeg

Timestamp:

Feb 23, 2014, 9:52:58 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

313a6c65

Parents:

d9574069 (diff), d59fcdaf (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/23/14 21:52:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/23/14 21:52:58)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: x86: add detection for Bit Manipulation Instruction sets

Conflicts:

libavutil/x86/cpu.c

See: 0bc3de19ffe296254f214dc7615e624d8e401bcb
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)