fix ffmpeg to work with installd version as well

Original commit message from CVS:
fix ffmpeg to work with installd version as well
parent ba9ed9b9
common @ f2d9b995
Subproject commit 1ca7d9a20180cab830f4383cde5ba932338e50b1 Subproject commit f2d9b99515c73da09bfe307d273d320f79a226da
...@@ -11,8 +11,8 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \ ...@@ -11,8 +11,8 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
gstffmpegprotocol.c \ gstffmpegprotocol.c \
gstffmpegtypes.c gstffmpegtypes.c
libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) -I/opt/src/sourceforge/ffmpeg/ -I/opt/src/sourceforge/ffmpeg/libavcodec/ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(FFMPEG_CFLAGS)
libgstffmpeg_la_LIBADD = libgstffmpeg_la_LIBADD =
libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -L/opt/src/sourceforge/ffmpeg/libavcodec -lavcodec -L/opt/src/sourceforge/ffmpeg/libav -lavformat libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FFMPEG_LIBS)
noinst_HEADERS = noinst_HEADERS =
...@@ -21,8 +21,14 @@ ...@@ -21,8 +21,14 @@
* object definition and other useful things. * object definition and other useful things.
*/ */
#include <libavcodec/avcodec.h> #include "config.h"
#include <libav/avformat.h> #ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#include <avformat.h>
#else
#include <ffmpeg/avcodec.h>
#include <ffmpeg/avformat.h>
#endif
#include <gst/gst.h> #include <gst/gst.h>
......
...@@ -17,7 +17,13 @@ ...@@ -17,7 +17,13 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <libavcodec/avcodec.h> #include "config.h"
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#else
#include <ffmpeg/avcodec.h>
#endif
#include <gst/gst.h> #include <gst/gst.h>
GstCaps * GstCaps *
......
...@@ -19,7 +19,12 @@ ...@@ -19,7 +19,12 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <libavcodec/avcodec.h> #include "config.h"
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#else
#include <ffmpeg/avcodec.h>
#endif
#include <gst/gst.h> #include <gst/gst.h>
......
...@@ -18,8 +18,14 @@ ...@@ -18,8 +18,14 @@
*/ */
#include <string.h> #include <string.h>
#include <libav/avformat.h> #include "config.h"
#include <libav/avi.h> #ifdef HAVE_FFMPEG_UNINSTALLED
#include <avformat.h>
#include <avi.h>
#else
#include <ffmpeg/avformat.h>
#include <ffmpeg/avi.h>
#endif
#include <gst/gst.h> #include <gst/gst.h>
......
...@@ -19,7 +19,12 @@ ...@@ -19,7 +19,12 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <libavcodec/avcodec.h> #include "config.h"
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#else
#include <ffmpeg/avcodec.h>
#endif
#include <gst/gst.h> #include <gst/gst.h>
......
...@@ -18,10 +18,15 @@ ...@@ -18,10 +18,15 @@
*/ */
#include <string.h> #include <string.h>
#include <libav/avformat.h> #include "config.h"
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avformat.h>
#else
#include <ffmpeg/avformat.h>
#endif
#include <gst/gst.h> #include <gst/gst.h>
typedef struct _GstFFMpegMux GstFFMpegMux; typedef struct _GstFFMpegMux GstFFMpegMux;
struct _GstFFMpegMux { struct _GstFFMpegMux {
......
...@@ -19,7 +19,13 @@ ...@@ -19,7 +19,13 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <libav/avformat.h> #include "config.h"
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avformat.h>
#else
#include <ffmpeg/avformat.h>
#endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/bytestream/bytestream.h> #include <gst/bytestream/bytestream.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