schro: #include math.h before schroedinger headers
authorScott D Phillips <scott.d.phillips@intel.com>
Tue, 29 Nov 2016 00:02:03 +0000 (16:02 -0800)
committerTim-Philipp Müller <tim@centricular.com>
Tue, 29 Nov 2016 09:49:05 +0000 (09:49 +0000)
The schroedinger headers unconditionally #define over C99's rint when
compiling with msvc which messes up the later inclusion of math.h.
Including math.h before schroedinger headers avoids getting syntax
errors in math.h

https://bugzilla.gnome.org/show_bug.cgi?id=775293

ext/schroedinger/gstschrodec.c
ext/schroedinger/gstschroenc.c
ext/schroedinger/gstschroutils.c

index 693e31c..bafd359 100644 (file)
@@ -28,8 +28,8 @@
 #include <gst/video/gstvideopool.h>
 #include <gst/video/gstvideodecoder.h>
 #include <string.h>
-#include <schroedinger/schro.h>
 #include <math.h>
+#include <schroedinger/schro.h>
 #include "gstschroutils.h"
 
 #include <schroedinger/schroparse.h>
index 22ccc5e..cf99316 100644 (file)
 #include <gst/video/gstvideoutils.h>
 #include <string.h>
 
+#include <math.h>
 #include <schroedinger/schro.h>
 #include <schroedinger/schrobitstream.h>
 #include <schroedinger/schrovirtframe.h>
-#include <math.h>
 #include "gstschroutils.h"
 
 GST_DEBUG_CATEGORY_EXTERN (schro_debug);
index 9057f98..87555f0 100644 (file)
@@ -21,6 +21,7 @@
 #include "config.h"
 #endif
 
+#include <math.h>
 #include "gstschroutils.h"
 
 //#define SCHRO_ENABLE_UNSTABLE_API
@@ -30,7 +31,6 @@
 #include <schroedinger/schro.h>
 #include <schroedinger/schrobitstream.h>
 #include <schroedinger/schrovirtframe.h>
-#include <math.h>
 #include <string.h>
 
 GST_DEBUG_CATEGORY_EXTERN (schro_debug);