From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 20 Feb 2014 22:18:02 +0000 (+0100)
Subject: Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'
X-Git-Tag: n2.2-rc1~150
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/36eec03211820b5b58795a8ae3521f20cd0285df

Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'

* commit '6adf4290ebcf65ac8243d74f34ba0a508f561633':
  configure: Move inet_aton check into network function check block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

36eec03211820b5b58795a8ae3521f20cd0285df