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)
commitf09b5fb4afedb711b169a582b2c1b1c61e6653e0
treea77e3e4e3501f1ecf008abb15191afcb784020df
parent756f865e3b66ba7e9b458cc00ccd386a3361978d
parent0f1fb6c0194c85483dedb93b20a5b76f6fc9d520
Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'

* 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>
cmdutils.c