Changeset 5176e965 in ffmpeg

Timestamp:

Feb 20, 2014, 10:27:13 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9026c49c

Parents:

36eec032 (diff), 2b0bb699 (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.

Message:

Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'

• commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0': configure: Move cpunop into ARCH_EXT_LIST_X86

Conflicts:

configure

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

(No files)