1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not suggest to use gas-preprocessor on aix where it doesn't work.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-16 01:38:44 +02:00
commit fdb6f66def

2
configure vendored
View File

@ -4281,7 +4281,7 @@ od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
if enabled asm && ! enabled_any ppc64 pic; then
enabled arm && nogas=die
enabled_all ppc altivec && nogas=warn
enabled_all ppc altivec && [ $target_os_default != aix ] && nogas=warn
as=${gas:=$as}
check_as <<EOF && enable gnu_as || \
$nogas "GNU assembler not found, install gas-preprocessor"