From 5c28dc809e24a3ad7c7cc30e428dfee8b9d7d27b Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 11 Sep 2003 19:53:57 +0000 Subject: Use ffmpeg libraries build by local automake Makefiles Original commit message from CVS: Use ffmpeg libraries build by local automake Makefiles --- common | 2 +- ext/ffmpeg/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common b/common index 6757dae..b4a839c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6757dae2885c2c09ad6db243c73946ef387bb044 +Subproject commit b4a839c99c0bf2d4903824426ef3cc0d4b0ad992 diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am index 1d25327..04aad29 100644 --- a/ext/ffmpeg/Makefile.am +++ b/ext/ffmpeg/Makefile.am @@ -13,8 +13,8 @@ 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 + $(top_builddir)/gst-libs/ext/ffmpeg/libavcodec.la \ + $(top_builddir)/gst-libs/ext/ffmpeg/libavformat.la libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -- cgit v1.2.1