From 886f5cc0f87560235ce4e0f32b43c99a20c89035 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Mon, 2 Dec 2002 22:34:25 +0000
Subject: [PATCH] peep

Original commit message from CVS:
peep
---
 common                      | 2 +-
 ext/ffmpeg/gstffmpegtypes.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common b/common
index f2d9b99515..c73793f702 160000
--- 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 d201e18e4a..354d6fa16d 100644
--- 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>