[FFmpeg-cvslog] Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 12:26:36 2013 +0100| [fd37a7dc3c1bc09e9f2367dc8487dd5cce9cf291] | committer: Michael Niedermayer

Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107'

* commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107':
  AVOptions: make av_set_options_string() forward options to child objects
  win32: Use 64-bit fstat/lseek variants for MSVC as well
  win32: Make ff_win32_open more robust

Conflicts:
	libavformat/os_support.c

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

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