ensonic gst-plugins-good: gst-plugins-good/ gst-plugins-good/ext/pulse/ gst-plugins-good/gst/avi/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     ensonic
Date:           Fri Dec 19 2008  09:36:59 UTC

Log message:
	* 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.

Modified files:
    .               : ChangeLog
    ext/pulse       : pulsemixerctrl.c
    gst/avi         : gstavimux.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3872&r2=1.3873
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulsemixerctrl.c.diff?r1=1.6&r2=1.7
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/avi/gstavimux.c.diff?r1=1.113&r2=1.114

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.3872
retrieving revision 1.3873
diff -u -d -r1.3872 -r1.3873
--- ChangeLog	17 Dec 2008 17:28:38 -0000	1.3872
+++ ChangeLog	19 Dec 2008 09:36:43 -0000	1.3873
@@ -1,3 +1,11 @@
+2008-12-19  Stefan Kost  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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  <[email protected]>
 	* docs/plugins/Makefile.am:
Index: pulsemixerctrl.c
RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulsemixerctrl.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pulsemixerctrl.c	17 Dec 2008 17:28:39 -0000	1.6
+++ pulsemixerctrl.c	19 Dec 2008 09:36:44 -0000	1.7
@@ -247,9 +247,6 @@
   /* 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,
Index: gstavimux.c
RCS file: /cvs/gstreamer/gst-plugins-good/gst/avi/gstavimux.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- gstavimux.c	16 Dec 2008 16:07:48 -0000	1.113
+++ gstavimux.c	19 Dec 2008 09:36:45 -0000	1.114
@@ -1769,7 +1769,7 @@
   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 @@
   }
   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);

------------------------------------------------------------------------------

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose