From 468d6d432603ff53e40c9f0d1880bda4c832d7ed Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 20 Apr 2005 09:45:33 +0000 Subject: [PATCH] gst/audioconvert/: Link against audio libs. Original commit message from CVS: * gst/audioconvert/Makefile.am: * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_chain), (gst_audio_convert_caps_remove_format_info), (gst_audio_convert_setcaps), (gst_audio_convert_fixate), (gst_audio_convert_channels): Link against audio libs. Fix audio convert plugin. --- ChangeLog | 10 ++++++++++ gst/audioconvert/Makefile.am | 2 +- gst/audioconvert/gstaudioconvert.c | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47fe664..3deab71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2005-04-20 Wim Taymans + * gst/audioconvert/Makefile.am: + * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_chain), + (gst_audio_convert_caps_remove_format_info), + (gst_audio_convert_setcaps), (gst_audio_convert_fixate), + (gst_audio_convert_channels): + Link against audio libs. + Fix audio convert plugin. + +2005-04-20 Wim Taymans + * ext/ogg/gstoggdemux.c: (gst_ogg_demux_factory_filter), (gst_ogg_demux_sink_activate): * ext/theora/theoraenc.c: (theora_enc_sink_setcaps), diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am index c4598a9..9ee562e 100644 --- a/gst/audioconvert/Makefile.am +++ b/gst/audioconvert/Makefile.am @@ -8,7 +8,7 @@ libgstaudioconvert_la_SOURCES = \ libgstaudioconvert_la_CFLAGS = $(GST_CFLAGS) libgstaudioconvert_la_LIBADD = -libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(top_builddir)/gst-libs/gst/audio/libgstaudio.la noinst_HEADERS = \ gstchannelmix.h \ diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index 2df979f..dd98d43 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -447,7 +447,7 @@ gst_audio_convert_setcaps (GstPad * pad, GstCaps * caps) *other_prefered = targetcaps; if (!gst_audio_convert_parse_caps (targetcaps, &other_ac_caps)) return FALSE; - GST_RPAD_CAPS (otherpad) = targetcaps; + gst_caps_replace (&GST_RPAD_CAPS (otherpad), targetcaps); } } if (this->sink == pad) { -- 2.7.4