From 0e40eb11bc5b41a583c269f39f8aaef9b4bf24ab Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 10 Sep 2012 17:08:00 +0200 Subject: [PATCH] configure.ac: Import top-level include directory And fixup all includes --- configure.ac | 17 +++-------------- ext/ffmpeg/gstffmpeg.c | 6 +----- ext/ffmpeg/gstffmpeg.h | 5 ----- ext/ffmpeg/gstffmpegaudioresample.c | 4 ---- ext/ffmpeg/gstffmpegcodecmap.c | 8 +++----- ext/ffmpeg/gstffmpegcodecmap.h | 4 ---- ext/ffmpeg/gstffmpegdec.c | 4 ---- ext/ffmpeg/gstffmpegdeinterlace.c | 6 +----- ext/ffmpeg/gstffmpegdemux.c | 12 ++---------- ext/ffmpeg/gstffmpegenc.c | 4 ---- ext/ffmpeg/gstffmpegmux.c | 6 +----- ext/ffmpeg/gstffmpegprotocol.c | 5 +---- ext/ffmpeg/gstffmpegscale.c | 6 +----- ext/ffmpeg/gstffmpegutils.h | 6 +----- ext/ffmpeg/gstffmpegviddec.c | 4 ---- ext/ffmpeg/gstffmpegvidenc.c | 4 ---- ext/libpostproc/gstpostproc.c | 5 ----- ext/libswscale/gstffmpegscale.c | 4 ---- 18 files changed, 14 insertions(+), 96 deletions(-) diff --git a/configure.ac b/configure.ac index 7f9abdd..4c565b3 100644 --- a/configure.ac +++ b/configure.ac @@ -268,11 +268,7 @@ else AC_MSG_NOTICE([Using local Libav snapshot]) dnl libgstlibav.la: include dirs - LIBAV_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav/libavutil \ - -I \$(top_srcdir)/gst-libs/ext/libav/libavformat \ - -I \$(top_srcdir)/gst-libs/ext/libav/libavcodec \ - -I \$(top_srcdir)/gst-libs/ext/libav \ - -I \$(top_builddir)/gst-libs/ext/libav \ + LIBAV_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav \ -Wno-deprecated-declarations" dnl libgstlibav.la: libs to statically link to @@ -280,11 +276,7 @@ else \$(top_builddir)/gst-libs/ext/libav/libavcodec/libavcodec.a \ \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a" dnl - POSTPROC_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav/libpostproc \ - -I \$(top_srcdir)/gst-libs/ext/libav/libavutil \ - -I \$(top_srcdir)/gst-libs/ext/libav/libavcodec \ - -I \$(top_srcdir)/gst-libs/ext/libav \ - -I \$(top_builddir)/gst-libs/ext/libav \ + POSTPROC_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav/ \ -Wno-deprecated-declarations" dnl libgstpostproc.la: libs to statically link to @@ -292,10 +284,7 @@ else \$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a" dnl - SWSCALE_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav/libswscale \ - -I \$(top_srcdir)/gst-libs/ext/libav/libavutil \ - -I \$(top_srcdir)/gst-libs/ext/libav \ - -I \$(top_builddir)/gst-libs/ext/libav \ + SWSCALE_CFLAGS="-I \$(top_srcdir)/gst-libs/ext/libav \ -Wno-deprecated-declarations" dnl libgstswscale.la: libs to statically link to diff --git a/ext/ffmpeg/gstffmpeg.c b/ext/ffmpeg/gstffmpeg.c index a0e79d0..f9340d2 100644 --- a/ext/ffmpeg/gstffmpeg.c +++ b/ext/ffmpeg/gstffmpeg.c @@ -27,13 +27,9 @@ #include #include #include -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#include -#else + #include #include -#endif #include "gstffmpeg.h" #include "gstffmpegutils.h" diff --git a/ext/ffmpeg/gstffmpeg.h b/ext/ffmpeg/gstffmpeg.h index 22ebc07..0ad05f3 100644 --- a/ext/ffmpeg/gstffmpeg.h +++ b/ext/ffmpeg/gstffmpeg.h @@ -24,13 +24,8 @@ #ifndef __GST_FFMPEG_H__ #define __GST_FFMPEG_H__ -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#include -#else #include #include -#endif #include diff --git a/ext/ffmpeg/gstffmpegaudioresample.c b/ext/ffmpeg/gstffmpegaudioresample.c index b3b28a7..6c425bc 100644 --- a/ext/ffmpeg/gstffmpegaudioresample.c +++ b/ext/ffmpeg/gstffmpegaudioresample.c @@ -24,11 +24,7 @@ #include "config.h" #endif -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else #include -#endif #include #include diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 0df3c2d..553b780 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -22,13 +22,11 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + +#include + #include -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else #include -#endif -#include #include "gstffmpeg.h" #include "gstffmpegcodecmap.h" diff --git a/ext/ffmpeg/gstffmpegcodecmap.h b/ext/ffmpeg/gstffmpegcodecmap.h index 2039631..52e5bec 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.h +++ b/ext/ffmpeg/gstffmpegcodecmap.h @@ -20,11 +20,7 @@ #ifndef __GST_FFMPEG_CODECMAP_H__ #define __GST_FFMPEG_CODECMAP_H__ -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else #include -#endif #include #include #include diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index c9c8281..813f39c 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -24,11 +24,7 @@ #include #include -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else #include -#endif #include diff --git a/ext/ffmpeg/gstffmpegdeinterlace.c b/ext/ffmpeg/gstffmpegdeinterlace.c index 69e1724..04ae9ab 100644 --- a/ext/ffmpeg/gstffmpegdeinterlace.c +++ b/ext/ffmpeg/gstffmpegdeinterlace.c @@ -24,11 +24,7 @@ # include "config.h" #endif -#ifdef HAVE_LIBAV_UNINSTALLED -# include -#else -# include -#endif +#include #include #include diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index 72735e2..caf38e0 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -24,17 +24,9 @@ #endif #include -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#ifdef HAVE_AVI_H -#include -#endif -#else + #include -#ifdef HAVE_AVI_H -#include -#endif -#endif +/* #include */ #include #include "gstffmpeg.h" diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c index ee32c99..8052b44 100644 --- a/ext/ffmpeg/gstffmpegenc.c +++ b/ext/ffmpeg/gstffmpegenc.c @@ -28,11 +28,7 @@ #include #include -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else #include -#endif #include diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c index 41e6e3f..a8186b7 100644 --- a/ext/ffmpeg/gstffmpegmux.c +++ b/ext/ffmpeg/gstffmpegmux.c @@ -22,12 +22,8 @@ #endif #include -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else -#include -#endif +#include #include #include diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/ffmpeg/gstffmpegprotocol.c index fc2aa97..0ec6672 100644 --- a/ext/ffmpeg/gstffmpegprotocol.c +++ b/ext/ffmpeg/gstffmpegprotocol.c @@ -23,11 +23,8 @@ #endif #include #include -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else + #include -#endif #include diff --git a/ext/ffmpeg/gstffmpegscale.c b/ext/ffmpeg/gstffmpegscale.c index 385a379..2c13c57 100644 --- a/ext/ffmpeg/gstffmpegscale.c +++ b/ext/ffmpeg/gstffmpegscale.c @@ -24,11 +24,7 @@ #include "config.h" #endif -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else -#include -#endif +#include #include #include diff --git a/ext/ffmpeg/gstffmpegutils.h b/ext/ffmpeg/gstffmpegutils.h index b517ca3..0efa730 100644 --- a/ext/ffmpeg/gstffmpegutils.h +++ b/ext/ffmpeg/gstffmpegutils.h @@ -24,12 +24,8 @@ #include "config.h" #endif -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#include -#else #include -#endif +#include #include diff --git a/ext/ffmpeg/gstffmpegviddec.c b/ext/ffmpeg/gstffmpegviddec.c index 32fde39..e57fa81 100644 --- a/ext/ffmpeg/gstffmpegviddec.c +++ b/ext/ffmpeg/gstffmpegviddec.c @@ -24,11 +24,7 @@ #include #include -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else #include -#endif #include #include diff --git a/ext/ffmpeg/gstffmpegvidenc.c b/ext/ffmpeg/gstffmpegvidenc.c index 4204e08..145b195 100644 --- a/ext/ffmpeg/gstffmpegvidenc.c +++ b/ext/ffmpeg/gstffmpegvidenc.c @@ -28,11 +28,7 @@ #include #include -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else #include -#endif #include #include diff --git a/ext/libpostproc/gstpostproc.c b/ext/libpostproc/gstpostproc.c index 8f9bb91..1898f2c 100644 --- a/ext/libpostproc/gstpostproc.c +++ b/ext/libpostproc/gstpostproc.c @@ -29,13 +29,8 @@ #include #endif -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#include -#else #include #include -#endif typedef struct _PostProcDetails PostProcDetails; diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c index 31849ba..ce980a8 100644 --- a/ext/libswscale/gstffmpegscale.c +++ b/ext/libswscale/gstffmpegscale.c @@ -23,11 +23,7 @@ #include "config.h" #endif -#ifdef HAVE_LIBAV_UNINSTALLED -#include -#else #include -#endif #include #include -- 2.7.4