mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-08-12 22:16:21 +00:00
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/platform: Update to reflect current MSVC build situation
Conflicts:
doc/platform.texi
See: ec0b0c2b58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: