mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Import top-level include directory

Browse source 
And fixup all includes
This commit is contained in:
Edward Hervey 2012-09-10 17:08:00 +02:00
parent 9f8e46d3d2
commit 0e40eb11bc
18 changed files with 15 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure.ac
View file

@ -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

6
ext/ffmpeg/gstffmpeg.c
View file

@ -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"

5
ext/ffmpeg/gstffmpeg.h
View file

@ -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>

4
ext/ffmpeg/gstffmpegaudioresample.c
View file

@ -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>

10
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -22,14 +22,12 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gst/gst.h>
#ifdef HAVE_LIBAV_UNINSTALLED
#include <avcodec.h>
#else
#include <libavcodec/avcodec.h>
#endif
#include <string.h>
#include <gst/gst.h>
#include <libavcodec/avcodec.h>
#include "gstffmpeg.h"
#include "gstffmpegcodecmap.h"

4
ext/ffmpeg/gstffmpegcodecmap.h
View file

@ -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>

4
ext/ffmpeg/gstffmpegdec.c
View file

@ -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>

6
ext/ffmpeg/gstffmpegdeinterlace.c
View file

@ -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>

12
ext/ffmpeg/gstffmpegdemux.c
View file

@ -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"

4
ext/ffmpeg/gstffmpegenc.c
View file

@ -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>

6
ext/ffmpeg/gstffmpegmux.c
View file

@ -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>

5
ext/ffmpeg/gstffmpegprotocol.c
View file

@ -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>

6
ext/ffmpeg/gstffmpegscale.c
View file

@ -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>

6
ext/ffmpeg/gstffmpegutils.h
View file

@ -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>

4
ext/ffmpeg/gstffmpegviddec.c
View file

@ -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>

4
ext/ffmpeg/gstffmpegvidenc.c
View file

@ -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>

5
ext/libpostproc/gstpostproc.c
View file

@ -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;

4
ext/libswscale/gstffmpegscale.c
View file

@ -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>