From: Michael Niedermayer Date: Sun, 15 Jun 2014 23:38:44 +0000 (+0200) Subject: Merge remote-tracking branch 'cehoyos/master' X-Git-Tag: n2.3~543 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=fdb6f66defacdb7a722a81e43e10f8519c48abe0 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 --- fdb6f66defacdb7a722a81e43e10f8519c48abe0