[FFmpeg-cvslog] Merge commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Thu Mar 30 11:04:12 2017 +0200| [8524b0162f01272dcefbcbbe79b2b90f117088f1] | committer: Clément Bœsch

Merge commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d'

* commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d':
  configure: Silence lld-link when getting the version number

Merged-by: Clément Bœsch <cboesch at gopro.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8524b0162f01272dcefbcbbe79b2b90f117088f1
---

 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index a63169d..aff6ca4 100755
--- a/configure
+++ b/configure
@@ -4110,7 +4110,7 @@ probe_cc(){
         _type=lld-link
         # The link.exe mode doesn't have a switch for getting the version,
         # but we can force it back to gnu mode and get the version from there.
-        _ident=$($_cc -flavor gnu --version)
+        _ident=$($_cc -flavor gnu --version 2>/dev/null)
         _ld_o='-out:$@'
         _flags_filter=msvc_flags
         _ld_lib='lib%.a'


======================================================================