From 8a234abada288096b879a73fb404da5a7616b3f6 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Mon, 10 Jan 2005 18:45:53 +0000 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ ext/theora/theoradec.c | 9 +++++++-- ext/vorbis/vorbisdec.c | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ad10ba..aab4ee2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-01-10 Ronald S. Bultje + + * 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 * TODO: diff --git a/ext/theora/theoradec.c b/ext/theora/theoradec.c index 849a81f..315c977 100644 --- 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 9543ee5..5a9dcaf 100644 --- 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; } -- 2.7.4