Changeset ff199543 in ffmpeg

Timestamp:

May 31, 2015, 7:57:07 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

47cc1a2b

Parents:

08f229d8 (diff), baa94563 (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 'baa94563fede8959a638b0fa132dd2124acd93e8'

• commit 'baa94563fede8959a638b0fa132dd2124acd93e8': ppc: linux: Check altivec using the auxv

Conflicts:

libavutil/ppc/cpu.c

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

(No files)