Michael Niedermayer fd37a7dc3c 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@gmx.at>

2013-03-28 12:26:36 +01:00

10 KiB

Raw Blame History

View Raw