mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/pulse/pulsemixerctrl.c: And remove temporary comment pointing to the bug ticket.

Browse source 
Original commit message from CVS:
* 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.
This commit is contained in:
Stefan Kost 2008-12-19 09:36:45 +00:00
parent bf0d9e34c2
commit 211bda0966
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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> 2008-12-17 Stefan Kost <ensonic@users.sf.net>
* ext/pulse/pulsemixerctrl.c: * ext/pulse/pulsemixerctrl.c:
@ -183,6 +191,7 @@
Make usage of libv4l optional by a configure parameter. Make usage of libv4l optional by a configure parameter.
Fixes bug #563504. Fixes bug #563504.
>>>>>>> 1.3872
2008-12-05 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-12-05 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* docs/plugins/Makefile.am: * docs/plugins/Makefile.am:

3
ext/pulse/pulsemixerctrl.c
View file

@ -247,9 +247,6 @@ gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c)
/* Subscribe to events */ /* Subscribe to events */
/* pa 0.9.10 leaks 36 bytes here
* http://www.pulseaudio.org/ticket/434
*/
if (!(o = if (!(o =
pa_context_subscribe (c->context, pa_context_subscribe (c->context,
PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE, PA_SUBSCRIPTION_MASK_SINK | PA_SUBSCRIPTION_MASK_SOURCE,

4
gst/avi/gstavimux.c
View file

@ -1769,7 +1769,7 @@ gst_avi_mux_do_buffer (GstAviMux * avimux, GstAviPad * avipad)
data = gst_buffer_make_metadata_writable (data); data = gst_buffer_make_metadata_writable (data);
gst_buffer_set_caps (data, GST_PAD_CAPS (avimux->srcpad)); 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) if ((res = gst_pad_push (avimux->srcpad, header)) != GST_FLOW_OK)
return res; return res;
@ -1822,7 +1822,7 @@ gst_avi_mux_do_one_buffer (GstAviMux * avimux)
} }
if (best_pad) { 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)); GST_PAD_NAME (best_pad->collect->pad), GST_TIME_ARGS (best_time));
return gst_avi_mux_do_buffer (avimux, best_pad); return gst_avi_mux_do_buffer (avimux, best_pad);