Commit 0e40eb11 authored by Edward Hervey's avatar Edward Hervey

configure.ac: Import top-level include directory

And fixup all includes
parent 9f8e46d3
......@@ -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
......
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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;
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment