[FFmpeg-cvslog] Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 20 23:18:02 2014 +0100| [36eec03211820b5b58795a8ae3521f20cd0285df] | committer: Michael Niedermayer

Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'

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

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

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