[FFmpeg-devel] Patch: OpenSSL and Windows

[Matt Oliver]

Hey
This is just a simple patch to fix compilation on Windows when OpenSSL is
enabled. The problem is that OpenSSL headers include "windows.h" which in
turn includes "winsock.h" by default. The problem is that ffmpeg then
includes "winsock2.h" which clashes with the previous winsock header and
causes compilation to fail. The trick is just to make sure winsock2 is
included before any inclusions of "windows.h".
Thats exactly all this patch does is change the order of some of the
include headers in tls.c. Thats it, absolutely nothing else, so not really
a major change but without compilation will not work on windows at all.

Matt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Fix-windows-build-with-openSSL-enabled.patch
Type: application/octet-stream
Size: 893 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140123/81d1f590/attachment.obj>