summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-08-25 09:53:18 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-08-25 09:53:18 +0000
commitbccaea232becc7034cc43a9fca121b316a31f387 (patch)
treef7954285b538d6cdacf2a39c21f4753c41c65bd3
parent2f4517a70b9ef85bd18d232b6596848f8a285f7c (diff)
ext/annodex/gstcmmlutils.c: Fix build.
Original commit message from CVS: * ext/annodex/gstcmmlutils.c: (gst_cmml_clock_time_from_npt): Fix build.
-rw-r--r--ChangeLog5
-rw-r--r--ext/annodex/gstcmmlutils.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0eb67752..de33daf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-08-25 Wim Taymans <wim@fluendo.com>
+ * ext/annodex/gstcmmlutils.c: (gst_cmml_clock_time_from_npt):
+ Fix build.
+
+2006-08-25 Wim Taymans <wim@fluendo.com>
+
Patch by: Alessandro Decina <alessandro at nnva dot org>
* ext/annodex/gstannodex.c: (gst_annodex_granule_to_time):
diff --git a/ext/annodex/gstcmmlutils.c b/ext/annodex/gstcmmlutils.c
index 48f7fb05..6dfe967b 100644
--- a/ext/annodex/gstcmmlutils.c
+++ b/ext/annodex/gstcmmlutils.c
@@ -63,7 +63,7 @@ gst_cmml_clock_time_from_npt (const gchar * time)
/* parse npt-sec */
hours_t = 0;
minutes = 0;
- fields = sscanf (time, "%llu.%d", &u64seconds, &mseconds);
+ fields = sscanf (time, "%" G_GUINT64_FORMAT ".%d", &u64seconds, &mseconds);
if (seconds < 0)
goto bad_input;