Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 31 Jan 2013 18:52:58 +0000 (19:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 31 Jan 2013 18:52:58 +0000 (19:52 +0100)
commit01d012ba3db91d555b6905d21afcb232150b9ecf
treed656893d72e6eda4f1e22cc89fed0869190c558b
parent324498f824701ab0bc1f666269e073c8922703ca
parent29f1fa74225e9fdbab6d590857edbecb51cf74da
Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'

* commit '29f1fa74225e9fdbab6d590857edbecb51cf74da':
  configure: Move newlib libc check before mingw libc check
  avisynth: Change demuxer name to avoid conflicts with AVS

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavformat/avisynth.c