diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 01:38:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 01:38:48 +0200 |
| commit | fdb6f66defacdb7a722a81e43e10f8519c48abe0 (patch) | |
| tree | 1b1bccd293f18923ae8b1dce49b3a258ec109713 | |
| parent | edf930472bbd892216751413476afcd6e6f0e7e8 (diff) | |
| parent | 08235708d84aa611795ad9786e469e68d7f9af81 (diff) | |
| download | ffmpeg-streaming-fdb6f66defacdb7a722a81e43e10f8519c48abe0.zip ffmpeg-streaming-fdb6f66defacdb7a722a81e43e10f8519c48abe0.tar.gz | |
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>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |
