ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Fri Apr 10 12:22:33 2015 +0300| [4f373a5111f900af54301907132942f95276285c] | committer: Martin Storsjö
vfwcap: Unbreak building after c201069fa These headers can't be included in any arbitrary order. Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f373a5111f900af54301907132942f95276285c --- libavdevice/vfwcap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 4182642..5e2ba84 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <vfw.h> -#include <windows.h> - #include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" @@ -30,6 +27,12 @@ #include "libavformat/avformat.h" #include "libavformat/internal.h" +// windows.h must no be included before winsock2.h, and libavformat internal +// headers may include winsock2.h +#include <windows.h> +// windows.h needs to be included before vfw.h +#include <vfw.h> + /* Some obsolete versions of MinGW32 before 4.0.0 lack this. */ #ifndef HWND_MESSAGE #define HWND_MESSAGE ((HWND) -3) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog