diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 21:57:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 21:57:07 +0200 |
| commit | ff1995437fa22f82bff68e3fca61dfed1efbdfbb (patch) | |
| tree | 012551f439a343a4e93292274de48535fae86509 /libavresample/version.h | |
| parent | 08f229d81e41f3aa5463f0c835bc03b0f8d64a71 (diff) | |
| parent | baa94563fede8959a638b0fa132dd2124acd93e8 (diff) | |
| download | ffmpeg-ff1995437fa22f82bff68e3fca61dfed1efbdfbb.tar.gz | |
Merge commit 'baa94563fede8959a638b0fa132dd2124acd93e8'
* commit 'baa94563fede8959a638b0fa132dd2124acd93e8':
ppc: linux: Check altivec using the auxv
Conflicts:
libavutil/ppc/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/version.h')
0 files changed, 0 insertions, 0 deletions