peep

Original commit message from CVS:
peep

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

diff --git a/ext/ffmpeg/gstffmpegtypes.c b/ext/ffmpeg/gstffmpegtypes.c
index d201e18..354d6fa 100644 (file)
--- a/ext/ffmpeg/gstffmpegtypes.c
+++ b/ext/ffmpeg/gstffmpegtypes.c
@@ -19,7 +19,11 @@
 
 #include <assert.h>
 #include <string.h>
-#include <libav/avformat.h>
+#ifdef HAVE_FFMPEG_UNINSTALLED
+#include <avformat.h>
+#else
+#include <ffmpeg/avformat.h>
+#endif
 
 #include <gst/gst.h>