summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-12-02 22:34:25 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-12-02 22:34:25 +0000
commit886f5cc0f87560235ce4e0f32b43c99a20c89035 (patch)
tree4afeb884bdf893d76a35bcbdd438392aa8ecc1ac
parentff9f7c32ca5880299d138f246e559b9e17f83953 (diff)
downloadgst-libav-886f5cc0f87560235ce4e0f32b43c99a20c89035.tar.gz
peep
Original commit message from CVS: peep
m---------common0
-rw-r--r--ext/ffmpeg/gstffmpegtypes.c6
2 files changed, 5 insertions, 1 deletions
diff --git a/common b/common
-Subproject f2d9b99515c73da09bfe307d273d320f79a226d
+Subproject c73793f7022cbc8ffd39f9c0b0587078f47c0b0
diff --git a/ext/ffmpeg/gstffmpegtypes.c b/ext/ffmpeg/gstffmpegtypes.c
index d201e18..354d6fa 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>