summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2003-09-11 19:53:57 +0000
committerDavid Schleef <ds@schleef.org>2003-09-11 19:53:57 +0000
commit5c28dc809e24a3ad7c7cc30e428dfee8b9d7d27b (patch)
treef953eff1969a0523d3a772b054ddf00f0c91ac6d
parent8a35cf6b6492ee3286025896b9c84d514930a827 (diff)
downloadgst-libav-5c28dc809e24a3ad7c7cc30e428dfee8b9d7d27b.tar.gz
Use ffmpeg libraries build by local automake Makefiles
Original commit message from CVS: Use ffmpeg libraries build by local automake Makefiles
m---------common0
-rw-r--r--ext/ffmpeg/Makefile.am4
2 files changed, 2 insertions, 2 deletions
diff --git a/common b/common
-Subproject 6757dae2885c2c09ad6db243c73946ef387bb04
+Subproject b4a839c99c0bf2d4903824426ef3cc0d4b0ad99
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)