ext/pango/gstclockoverlay.c: Fix unused variable warning if HAVE_LOCALTIME_R is undef...

Original commit message from CVS:
Patch by: Vincent Torri <vtorri at univ-evry dot fr>
* ext/pango/gstclockoverlay.c: (gst_clock_overlay_render_time):
Fix unused variable warning if HAVE_LOCALTIME_R is undefinied
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps):
* gst/audioresample/gstaudioresample.c: (audioresample_do_output):
Use the correct format strings for integer formats.

diff --git a/ChangeLog b/ChangeLog
index 0829c13..4c0e8c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-04-17  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       Patch by: Vincent Torri <vtorri at univ-evry dot fr>
+
+       * ext/pango/gstclockoverlay.c: (gst_clock_overlay_render_time):
+       Fix unused variable warning if HAVE_LOCALTIME_R is undefinied
+
+       * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps):
+       * gst/audioresample/gstaudioresample.c: (audioresample_do_output):
+       Use the correct format strings for integer formats.
+
 2007-04-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * ext/theora/theoraenc.c (theora_buffer_from_packet, theora_enc_chain):

diff --git a/ext/pango/gstclockoverlay.c b/ext/pango/gstclockoverlay.c
index efffb02..72478c1 100644 (file)
--- a/ext/pango/gstclockoverlay.c
+++ b/ext/pango/gstclockoverlay.c
@@ -76,9 +76,13 @@ GST_BOILERPLATE (GstClockOverlay, gst_clock_overlay, GstTextOverlay,
 static gchar *
 gst_clock_overlay_render_time (GstClockOverlay * overlay)
 {
-  struct tm dummy, *t;
+  struct tm *t;
   time_t now;
 
+#ifdef HAVE_LOCALTIME_R
+  struct tm dummy;
+#endif
+
   now = time (NULL);
 
 #ifdef HAVE_LOCALTIME_R

diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 67dc5b1..d765a3f 100644 (file)
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -1179,13 +1179,13 @@ gst_riff_create_audio_caps (guint16 codec_id,
   /* ERROR */
 too_many_channels:
   GST_WARNING
-      ("Stream claims to contain %lu channels, but format only supports %lu",
+      ("Stream claims to contain %u channels, but format only supports %d",
       strf->channels, channels_max);
   gst_caps_unref (caps);
   return NULL;
 invalid_rate:
   GST_WARNING
-      ("Stream with sample_rate %lu, but format only supports %lu .. %lu",
+      ("Stream with sample_rate %u, but format only supports %d .. %d",
       strf->rate, rate_min, rate_max);
   gst_caps_unref (caps);
   return NULL;

diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c
index 98f08d8..5325792 100644 (file)
--- a/gst/audioresample/gstaudioresample.c
+++ b/gst/audioresample/gstaudioresample.c
@@ -564,7 +564,7 @@ audioresample_do_output (GstAudioresample * audioresample, GstBuffer * outbuf)
     audioresample->need_discont = FALSE;
   }
 
-  GST_LOG_OBJECT (audioresample, "transformed to buffer of %ld bytes, ts %"
+  GST_LOG_OBJECT (audioresample, "transformed to buffer of %d bytes, ts %"
       GST_TIME_FORMAT ", duration %" GST_TIME_FORMAT ", offset %"
       G_GINT64_FORMAT ", offset_end %" G_GINT64_FORMAT,
       outsize, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)),