configure.ac: Import top-level include directory

And fixup all includes

diff --git a/configure.ac b/configure.ac
index 7f9abdd..4c565b3 100644 (file)
--- 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 (file)
--- a/ext/ffmpeg/gstffmpeg.c
+++ b/ext/ffmpeg/gstffmpeg.c
@@ -27,13 +27,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <gst/gst.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#include <avformat.h>
-#else
+
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#endif
 
 #include "gstffmpeg.h"
 #include "gstffmpegutils.h"

diff --git a/ext/ffmpeg/gstffmpeg.h b/ext/ffmpeg/gstffmpeg.h
index 22ebc07..0ad05f3 100644 (file)
--- 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 <avcodec.h>
-#include <avformat.h>
-#else
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#endif
 
 #include <gst/gst.h>
 

diff --git a/ext/ffmpeg/gstffmpegaudioresample.c b/ext/ffmpeg/gstffmpegaudioresample.c
index b3b28a7..6c425bc 100644 (file)
--- a/ext/ffmpeg/gstffmpegaudioresample.c
+++ b/ext/ffmpeg/gstffmpegaudioresample.c
@@ -24,11 +24,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 0df3c2d..553b780 100644 (file)
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -22,13 +22,11 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include <string.h>
+
 #include <gst/gst.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
-#include <string.h>
 
 #include "gstffmpeg.h"
 #include "gstffmpegcodecmap.h"

diff --git a/ext/ffmpeg/gstffmpegcodecmap.h b/ext/ffmpeg/gstffmpegcodecmap.h
index 2039631..52e5bec 100644 (file)
--- 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 <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 #include <gst/gst.h>
 #include <gst/audio/audio.h>
 #include <gst/video/video.h>

diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index c9c8281..813f39c 100644 (file)
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -24,11 +24,7 @@
 #include <assert.h>
 #include <string.h>
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 
 #include <gst/gst.h>
 

diff --git a/ext/ffmpeg/gstffmpegdeinterlace.c b/ext/ffmpeg/gstffmpegdeinterlace.c
index 69e1724..04ae9ab 100644 (file)
--- a/ext/ffmpeg/gstffmpegdeinterlace.c
+++ b/ext/ffmpeg/gstffmpegdeinterlace.c
@@ -24,11 +24,7 @@
 #  include "config.h"
 #endif
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#  include <avcodec.h>
-#else
-#  include <libavcodec/avcodec.h>
-#endif
+#include <libavcodec/avcodec.h>
 
 #include <gst/gst.h>
 #include <gst/video/video.h>

diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 72735e2..caf38e0 100644 (file)
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -24,17 +24,9 @@
 #endif
 
 #include <string.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avformat.h>
-#ifdef HAVE_AVI_H
-#include <avi.h>
-#endif
-#else
+
 #include <libavformat/avformat.h>
-#ifdef HAVE_AVI_H
-#include <ffmpeg/avi.h>
-#endif
-#endif
+/* #include <ffmpeg/avi.h> */
 #include <gst/gst.h>
 
 #include "gstffmpeg.h"

diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index ee32c99..8052b44 100644 (file)
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -28,11 +28,7 @@
 #include <glib/gstdio.h>
 #include <errno.h>
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 
 #include <gst/gst.h>
 

diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index 41e6e3f..a8186b7 100644 (file)
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -22,12 +22,8 @@
 #endif
 
 #include <string.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avformat.h>
-#else
-#include <libavformat/avformat.h>
-#endif
 
+#include <libavformat/avformat.h>
 #include <gst/gst.h>
 #include <gst/base/gstcollectpads.h>
 

diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/ffmpeg/gstffmpegprotocol.c
index fc2aa97..0ec6672 100644 (file)
--- a/ext/ffmpeg/gstffmpegprotocol.c
+++ b/ext/ffmpeg/gstffmpegprotocol.c
@@ -23,11 +23,8 @@
 #endif
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avformat.h>
-#else
+
 #include <libavformat/avformat.h>
-#endif
 
 #include <gst/gst.h>
 

diff --git a/ext/ffmpeg/gstffmpegscale.c b/ext/ffmpeg/gstffmpegscale.c
index 385a379..2c13c57 100644 (file)
--- a/ext/ffmpeg/gstffmpegscale.c
+++ b/ext/ffmpeg/gstffmpegscale.c
@@ -24,11 +24,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
-#include <ffmpeg/avcodec.h>
-#endif
+#include <libavcodec/avcodec.h>
 
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>

diff --git a/ext/ffmpeg/gstffmpegutils.h b/ext/ffmpeg/gstffmpegutils.h
index b517ca3..0efa730 100644 (file)
--- a/ext/ffmpeg/gstffmpegutils.h
+++ b/ext/ffmpeg/gstffmpegutils.h
@@ -24,12 +24,8 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <mathematics.h>
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
+#include <libavutil/mathematics.h>
 
 #include <gst/gst.h>
 

diff --git a/ext/ffmpeg/gstffmpegviddec.c b/ext/ffmpeg/gstffmpegviddec.c
index 32fde39..e57fa81 100644 (file)
--- a/ext/ffmpeg/gstffmpegviddec.c
+++ b/ext/ffmpeg/gstffmpegviddec.c
@@ -24,11 +24,7 @@
 #include <assert.h>
 #include <string.h>
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 
 #include <gst/gst.h>
 #include <gst/video/video.h>

diff --git a/ext/ffmpeg/gstffmpegvidenc.c b/ext/ffmpeg/gstffmpegvidenc.c
index 4204e08..145b195 100644 (file)
--- a/ext/ffmpeg/gstffmpegvidenc.c
+++ b/ext/ffmpeg/gstffmpegvidenc.c
@@ -28,11 +28,7 @@
 #include <glib/gstdio.h>
 #include <errno.h>
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#else
 #include <libavcodec/avcodec.h>
-#endif
 
 #include <gst/gst.h>
 #include <gst/video/gstvideometa.h>

diff --git a/ext/libpostproc/gstpostproc.c b/ext/libpostproc/gstpostproc.c
index 8f9bb91..1898f2c 100644 (file)
--- a/ext/libpostproc/gstpostproc.c
+++ b/ext/libpostproc/gstpostproc.c
@@ -29,13 +29,8 @@
 #include <orc/orc.h>
 #endif
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <avcodec.h>
-#include <postprocess.h>
-#else
 #include <libavcodec/avcodec.h>
 #include <libpostproc/postprocess.h>
-#endif
 
 
 typedef struct _PostProcDetails PostProcDetails;

diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c
index 31849ba..ce980a8 100644 (file)
--- a/ext/libswscale/gstffmpegscale.c
+++ b/ext/libswscale/gstffmpegscale.c
@@ -23,11 +23,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_LIBAV_UNINSTALLED
-#include <swscale.h>
-#else
 #include <libswscale/swscale.h>
-#endif
 
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>