[FFmpeg-cvslog] avdevice/dshow: fix build, ensure that feature enable #defines are set before includes

Michael Niedermayer git at videolan.org
Tue Nov 25 04:04:52 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 25 03:49:09 2014 +0100| [60420fa3dc88590eef20a828805c6d229d8e648a] | committer: Michael Niedermayer

avdevice/dshow: fix build, ensure that feature enable #defines are set before includes

dshow_capture.h sets up various flags before including windows headers
this must occur before other headers (like os_support.h) include these
headers without the setup

This could be fixed differently but for now this fixes building on mingw

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavdevice/dshow.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index a543249..59d0818 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "dshow_capture.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"
 #include "libavformat/internal.h"
 #include "libavformat/riff.h"
 #include "avdevice.h"
-#include "dshow_capture.h"
 #include "libavcodec/raw.h"
 
 struct dshow_ctx {



More information about the ffmpeg-cvslog mailing list