Use ffmpeg libraries build by local automake Makefiles
authorDavid Schleef <ds@schleef.org>
Thu, 11 Sep 2003 19:53:57 +0000 (19:53 +0000)
committerDavid Schleef <ds@schleef.org>
Thu, 11 Sep 2003 19:53:57 +0000 (19:53 +0000)
Original commit message from CVS:
Use ffmpeg libraries build by local automake Makefiles

common
ext/ffmpeg/Makefile.am

diff --git a/common b/common
index 6757dae..b4a839c 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 6757dae2885c2c09ad6db243c73946ef387bb044
+Subproject commit b4a839c99c0bf2d4903824426ef3cc0d4b0ad992
index 1d25327..04aad29 100644 (file)
@@ -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)