ext/theora/theoradec.c: Fix broken code generation by gcc by swapping arguments.

Original commit message from CVS:
* ext/theora/theoradec.c: (theora_dec_chain):
Fix broken code generation by gcc by swapping arguments.
* ext/vorbis/vorbisdec.c: (vorbis_dec_src_query):
Fix \n in debug.

diff --git a/ChangeLog b/ChangeLog
index 0ad10ba39ec399720b2e64fcbb55203a21d7318f..aab4ee2a391fe8e49af98bb05724d19e0a818135 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-10  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * ext/theora/theoradec.c: (theora_dec_chain):
+         Fix broken code generation by gcc by swapping arguments.
+       * ext/vorbis/vorbisdec.c: (vorbis_dec_src_query):
+         Fix \n in debug.
+
 2005-01-10  Stephane LOEUILLET  <stephane.loeuillet@tiscali.fr>
 
        * TODO:

diff --git a/ext/theora/theoradec.c b/ext/theora/theoradec.c
index 849a81fc6d0831cde0318284a2f8f56c31e86ed3..315c977bcc82e6b1b8e873e996e3cc907a0e799f 100644 (file)
--- a/ext/theora/theoradec.c
+++ b/ext/theora/theoradec.c
@@ -556,8 +556,10 @@ theora_dec_chain (GstPad * pad, GstData * data)
   packet.b_o_s = (packet.packetno == 0) ? 1 : 0;
   packet.e_o_s = 0;
 
-  GST_DEBUG_OBJECT (dec, "header=%d packetno=%d, outtime=%" GST_TIME_FORMAT,
-      packet.packet[0], packet.packetno, GST_TIME_ARGS (outtime));
+  GST_DEBUG_OBJECT (dec, "outtime=%" GST_TIME_FORMAT " (%"
+      G_GUINT64_FORMAT ") header=0x%02x packetno=%d",
+      GST_TIME_ARGS (outtime), outtime,
+      (gint) packet.packet[0], packet.packetno);
 
   /* switch depending on packet type */
   if (packet.packet[0] & 0x80) {
@@ -702,6 +704,9 @@ theora_dec_chain (GstPad * pad, GstData * data)
       if (add_one) {
         outtime = GST_SECOND * theora_granule_time (&dec->state,
             dec->granulepos);
+        GST_DEBUG_OBJECT (dec,
+            "Correcting output time to %" GST_TIME_FORMAT,
+            GST_TIME_ARGS (outtime));
       }
     } else if (dec->need_keyframe) {
       GST_WARNING_OBJECT (dec, "dropping frame because we need a keyframe");

diff --git a/ext/vorbis/vorbisdec.c b/ext/vorbis/vorbisdec.c
index 9543ee593e6a6d13f9b8170edbc6ef92a8c3189e..5a9dcaf7a1352e06968904fe43184ef46d6998a6 100644 (file)
--- a/ext/vorbis/vorbisdec.c
+++ b/ext/vorbis/vorbisdec.c
@@ -257,7 +257,7 @@ vorbis_dec_src_query (GstPad * pad, GstQueryType query, GstFormat * format,
     return FALSE;
 
   GST_LOG_OBJECT (dec,
-      "query %u: peer returned granulepos: %llu - we return %llu (format %u)\n",
+      "query %u: peer returned granulepos: %llu - we return %llu (format %u)",
       query, granulepos, *value, *format);
   return TRUE;
 }