Merge commit '4f373a51'

* commit '4f373a51':
  vfwcap: Unbreak building after c201069f

Conflicts:
	libavdevice/vfwcap.c

See: 4d0f6d3fMerged-by: Michael Niedermayer <michaelni@gmx.at>

libavdevice/vfwcap.c

@@ -26,7 +26,10 @@
 
 #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>
 
 #include "avdevice.h"