[FFmpeg-cvslog] Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  8 11:54:10 2013 +0200| [f09b5fb4afedb711b169a582b2c1b1c61e6653e0] | committer: Michael Niedermayer

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 at gmx.at>

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