ext: Fix CFLAGS order

We'd pick up system-wide ffmpeg headers otherwise

diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am
index 083f2657ddefe0b023e824955b043deceef0e3b1..3c02817244961f648dd4de72954a07b7acced5f4 100644 (file)
--- a/ext/ffmpeg/Makefile.am
+++ b/ext/ffmpeg/Makefile.am
@@ -20,8 +20,7 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
 #      \
 #                        gstffmpegscale.c
 
-libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
-       $(FFMPEG_CFLAGS)
+libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS)
 libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
 libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/libpostproc/Makefile.am b/ext/libpostproc/Makefile.am
index 1c4e7d827fee9f2a88b6786c54da61d68ec0d930..e77dd0081c88cd6f9856384125e40108996f594a 100644 (file)
--- a/ext/libpostproc/Makefile.am
+++ b/ext/libpostproc/Makefile.am
@@ -2,8 +2,7 @@ plugin_LTLIBRARIES = libgstpostproc.la
 
 libgstpostproc_la_SOURCES = gstpostproc.c
 
-libgstpostproc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) \
-       $(POSTPROC_CFLAGS)
+libgstpostproc_la_CFLAGS = $(POSTPROC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS)
 libgstpostproc_la_LIBADD = -lgstvideo-@GST_MAJORMINOR@ \
        $(POSTPROC_LIBS) \
        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(ORC_LIBS)

diff --git a/ext/libswscale/Makefile.am b/ext/libswscale/Makefile.am
index 9363a337caeb8b8bbde50d7e2939c87cddc67ac7..8bc2e35b24bdcdfd4c65519c0c94c37557b41af1 100644 (file)
--- a/ext/libswscale/Makefile.am
+++ b/ext/libswscale/Makefile.am
@@ -2,9 +2,8 @@ plugin_LTLIBRARIES = libgstffmpegscale.la
 
 libgstffmpegscale_la_SOURCES = gstffmpegscale.c
 
-libgstffmpegscale_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-       $(GST_PLUGINS_BASE_CFLAGS) \
-       $(ORC_CFLAGS) $(SWSCALE_CFLAGS)
+libgstffmpegscale_la_CFLAGS = $(SWSCALE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \
+       $(ORC_CFLAGS)
 libgstffmpegscale_la_LIBADD = $(SWSCALE_LIBS) \
        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
        $(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz