Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:54:10 +0000 (11:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:54:14 +0000 (11:54 +0200)
* commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520':
  libavutil: Don't use fcntl if the function does not exist
  cmdutils: Only do the windows-specific commandline parsing on _WIN32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
cmdutils.c

diff --cc cmdutils.c
Simple merge