mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-20 05:16:38 +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:
commit
b723c4e67e