diff --git a/common b/common
index 79e6940e7f..4a7bc52a89 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 79e6940e7ff1a6cbf959a1f7a0a3d1ed3f90d3ee
+Subproject commit 4a7bc52a893bdd9fefa9fabe460c827822a9e0f2
diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am
index ee09b887e0..8e637813fd 100644
--- a/ext/ffmpeg/Makefile.am
+++ b/ext/ffmpeg/Makefile.am
@@ -11,8 +11,13 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c 		\
 			  gstffmpegprotocol.c 	\
 			  gstffmpegtypes.c 	
 
-libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(FFMPEG_CFLAGS)
-libgstffmpeg_la_LIBADD = 
-libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(FFMPEG_LIBS)
+libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) \
+	-I $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec \
+	-I $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat
+libgstffmpeg_la_LIBADD = \
+	$(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.a \
+	$(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat/libavformat.a
+
+libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS =