summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-10 18:08:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-10 18:09:26 +0200
commit4d0f6d3fb421b3ab774ccd3c299f0a242f359a75 (patch)
tree08aa5ae4f7ee503445288a839113699798147ed5
parent8d15de7eb265fdd81211190d5ef3f9d1665770bf (diff)
downloadffmpeg-streaming-4d0f6d3fb421b3ab774ccd3c299f0a242f359a75.zip
ffmpeg-streaming-4d0f6d3fb421b3ab774ccd3c299f0a242f359a75.tar.gz
avdevice/vfwcap: revert header reordering from c201069fac9a76e6604f9d84d76a172434d62200
This should fix build on vs2013 Found-by: Ferdinand Oeinck <ferdo@bigroses.demon.nl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavdevice/vfwcap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c
index f99c556..167c40b 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 <windows.h>
-#include <vfw.h>
-
#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
@@ -29,6 +26,9 @@
#include "libavformat/internal.h"
+#include <windows.h>
+#include <vfw.h>
+
#include "avdevice.h"
/* Some obsolete versions of MinGW32 before 4.0.0 lack this. */
OpenPOWER on IntegriCloud