diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2002-12-26 10:53:21 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2002-12-26 10:53:21 +0000 |
| commit | 63c54e235000691fcd8ca7d99d04ac55ee7b1f92 (patch) | |
| tree | 31ed698e69a000041eba5e416d05ceadc840680a | |
| parent | 0d32d395f13dd6528cf42b43ddf87bc581f4be2b (diff) | |
slurp in ffmpeg a) please test b) please help me figure out how to portably link in a .a file in our .so plugin
Original commit message from CVS:
slurp in ffmpeg
a) please test
b) please help me figure out how to portably link in a .a file in our
.so plugin
| m--------- | common | 0 | ||||
| -rw-r--r-- | ext/ffmpeg/Makefile.am | 11 |
2 files changed, 8 insertions, 3 deletions
diff --git a/common b/common -Subproject 79e6940e7ff1a6cbf959a1f7a0a3d1ed3f90d3e +Subproject 4a7bc52a893bdd9fefa9fabe460c827822a9e0f 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 = |