[FFmpeg-cvslog] avdevice/vfwcap: revert header reordering from c201069fac9a76e6604f9d84d76a172434d62200

Michael Niedermayer git at videolan.org
Fri Apr 10 18:26:30 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 10 18:08:52 2015 +0200| [4d0f6d3fb421b3ab774ccd3c299f0a242f359a75] | committer: Michael Niedermayer

avdevice/vfwcap: revert header reordering from c201069fac9a76e6604f9d84d76a172434d62200

This should fix build on vs2013

Found-by: Ferdinand Oeinck <ferdo at bigroses.demon.nl>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d0f6d3fb421b3ab774ccd3c299f0a242f359a75
---

 libavdevice/vfwcap.c |    6 +++---
 1 file 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. */



More information about the ffmpeg-cvslog mailing list