On 11 April 2015 at 03:05, Michael Niedermayer <michae...@gmx.at> wrote:
> On Fri, Apr 10, 2015 at 11:48:11PM +1000, Matt Oliver wrote: > > Recent merge fe25194c5870f21ba10f615f036b64d0c84fca48 broke compilation > > under windows by changing the inclusion order of winsock.h and windows.h > > (winsock is included in libavformat/internal.h) > > > > See recent fate tests for error: > > > http://fate.ffmpeg.org/report.cgi?time=20150410045531&slot=x86_32-msvc12-windows-native > > > > The following patch fixes this by explicitly including > > libavformat/internal.h first. Since Ive made similar fixes to this file > > before I added a comment to make it clear that the header include order > > cant be changed so as to avoid the same issue arising in the future. > > > vfwcap.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > df99669c353cb7b48434d4f3fb59e824c234c53b > 0001-lavd-vfwcap-Fix-compilation-under-windows.patch > > From ef7f28963e9730e630e4c4fbf57572df6d798509 Mon Sep 17 00:00:00 2001 > > From: Matt Oliver <protogo...@gmail.com> > > Date: Fri, 10 Apr 2015 23:45:01 +1000 > > Subject: [PATCH] lavd/vfwcap: Fix compilation under windows. > > oops ive missed this patch, Ferdinand Oeinck told me privately about > this bug and i had fixed it slightly differently > > is the commited fix ok? > or should something be changed? > The committed fix works fine. The main thing is to ensure the libavformat/internal.h is included before windows.h which it does. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel