fix ffmpeg to work with installd version as well

Original commit message from CVS:
fix ffmpeg to work with installd version as well

diff --git a/common b/common
index 1ca7d9a..f2d9b99 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 1ca7d9a20180cab830f4383cde5ba932338e50b1
+Subproject commit f2d9b99515c73da09bfe307d273d320f79a226da

diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am
index 133d3a3..0f3af94 100644 (file)
--- a/ext/ffmpeg/Makefile.am
+++ b/ext/ffmpeg/Makefile.am
@@ -11,8 +11,8 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c                 \
                          gstffmpegprotocol.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_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 = 

diff --git a/ext/ffmpeg/gstffmpeg.c b/ext/ffmpeg/gstffmpeg.c
index e9d04ec..af1acfa 100644 (file)
--- a/ext/ffmpeg/gstffmpeg.c
+++ b/ext/ffmpeg/gstffmpeg.c
@@ -21,8 +21,14 @@
  * object definition and other useful things.
  */
 
-#include <libavcodec/avcodec.h>
-#include <libav/avformat.h>
+#include "config.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>
 

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 13add65..1654379 100644 (file)
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -17,7 +17,13 @@
  * 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>
 
 GstCaps *

diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 46b499d..97e05d0 100644 (file)
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -19,7 +19,12 @@
 
 #include <assert.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>
 

diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 6a620a9..89b5196 100644 (file)
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -18,8 +18,14 @@
  */
 
 #include <string.h>
-#include <libav/avformat.h>
-#include <libav/avi.h>
+#include "config.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>
 

diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index fdf8265..15692ed 100644 (file)
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -19,7 +19,12 @@
 
 #include <string.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>
 

diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index 849720a..7737781 100644 (file)
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -18,10 +18,15 @@
  */
 
 #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>
-       
+
 typedef struct _GstFFMpegMux GstFFMpegMux;
 
 struct _GstFFMpegMux {

diff --git a/ext/ffmpeg/gstffmpegprotocol.c b/ext/ffmpeg/gstffmpegprotocol.c
index 9d9cdb4..edfa4a4 100644 (file)
--- a/ext/ffmpeg/gstffmpegprotocol.c
+++ b/ext/ffmpeg/gstffmpegprotocol.c
@@ -19,7 +19,13 @@
 
 #include <string.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/bytestream/bytestream.h>