diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ext/pulse/pulsemixerctrl.c | 3 | ||||
| -rw-r--r-- | gst/avi/gstavimux.c | 4 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2008-12-19 Stefan Kost <ensonic@users.sf.net> + + * ext/pulse/pulsemixerctrl.c: + And remove temporary comment pointing to the bug ticket. + + * gst/avi/gstavimux.c: + Move reoccuring logging to LOG and log instance too. + 2008-12-17 Stefan Kost <ensonic@users.sf.net> * ext/pulse/pulsemixerctrl.c: @@ -183,6 +191,7 @@ Make usage of libv4l optional by a configure parameter. Fixes bug #563504. +>>>>>>> 1.3872 2008-12-05 Sebastian Dröge <sebastian.droege@collabora.co.uk> * docs/plugins/Makefile.am: diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c index dc961241..a7bc9a17 100644 --- a/ext/pulse/pulsemixerctrl.c +++ b/ext/pulse/pulsemixerctrl.c @@ -247,9 +247,6 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c) /* Subscribe to events */ - /* pa 0.9.10 leaks 36 bytes here - * http://www.pulseaudio.org/ticket/434 - */ if (!(o = pa_context_subscribe (c->context, PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE, diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index f947ffc9..0e3c4ad3 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -1769,7 +1769,7 @@ gst_avi_mux_do_buffer (GstAviMux * avimux, GstAviPad * avipad) data = gst_buffer_make_metadata_writable (data); gst_buffer_set_caps (data, GST_PAD_CAPS (avimux->srcpad)); - GST_DEBUG ("pushing buffers: head, data"); + GST_LOG_OBJECT (avimux, "pushing buffers: head, data"); if ((res = gst_pad_push (avimux->srcpad, header)) != GST_FLOW_OK) return res; @@ -1822,7 +1822,7 @@ gst_avi_mux_do_one_buffer (GstAviMux * avimux) } if (best_pad) { - GST_DEBUG_OBJECT (avimux, "selected pad %s with time %" GST_TIME_FORMAT, + GST_LOG_OBJECT (avimux, "selected pad %s with time %" GST_TIME_FORMAT, GST_PAD_NAME (best_pad->collect->pad), GST_TIME_ARGS (best_time)); return gst_avi_mux_do_buffer (avimux, best_pad); |