[FFmpeg-devel] Patch: OpenSSL and Windows

[Michael Niedermayer]

On Thu, Jan 23, 2014 at 09:52:50PM +1100, Matt Oliver wrote:
> 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

>  tls.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 7a9f10f4dff5503a88a75ce0aad345cb3f51c595  Fix-windows-build-with-openSSL-enabled.patch
> From 3d59d362533e7750ce58769563fcf214f14bb4e3 Mon Sep 17 00:00:00 2001
> From: Matt Oliver <protogonoi at gmail.com>
> Date: Mon, 20 Jan 2014 23:13:51 +1100
> Subject: [PATCH] Fix windows build with openSSL enabled.
> 
> ---
>  libavformat/tls.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

applied

thanks

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 2
"100% positive feedback" - "All either got their money back or didnt complain"
"Best seller ever, very honest" - "Seller refunded buyer after failed scam"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140123/fa5d0c51/attachment.asc>