From: Michael Niedermayer Date: Mon, 16 Jun 2014 11:13:21 +0000 (+0200) Subject: Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb' X-Git-Tag: n2.3~536 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=8a4a84a70a2e0bcfadcc955493c94be8f3ca8ce9 Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb' * commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb': configure: Directly support Android as target OS Merged-by: Michael Niedermayer --- 8a4a84a70a2e0bcfadcc955493c94be8f3ca8ce9