summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Granseuer <jensgr@gmx.net>2008-04-29 19:11:56 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-04-29 19:11:56 +0000
commit9c984b9594c29ecacf9a6c20f3280ecb83001263 (patch)
tree01d5a78a98cef13e53efa62a2a06b6137ddf98b4
parent63fae1c4bb8b0f2d317bd39c71cc77a319224c7a (diff)
downloadgst-plugins-bad-9c984b9594c29ecacf9a6c20f3280ecb83001263.tar.gz
gst-plugins-bad-9c984b9594c29ecacf9a6c20f3280ecb83001263.tar.bz2
gst-plugins-bad-9c984b9594c29ecacf9a6c20f3280ecb83001263.zip
gst/subenc/gstsrtenc.c: Declare variables at the beginning of blocks. Fixes compilation with gcc 2.x and other compil...
Original commit message from CVS: Patch by: Jens Granseuer <jensgr at gmx dot net> * gst/subenc/gstsrtenc.c: (gst_srt_enc_timestamp_to_string): Declare variables at the beginning of blocks. Fixes compilation with gcc 2.x and other compilers. Fixes bug #530611.
-rw-r--r--ChangeLog8
-rw-r--r--gst/subenc/gstsrtenc.c10
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e27a454..74718791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-29 Sebastian Dröge <slomo@circular-chaos.org>
+
+ Patch by: Jens Granseuer <jensgr at gmx dot net>
+
+ * gst/subenc/gstsrtenc.c: (gst_srt_enc_timestamp_to_string):
+ Declare variables at the beginning of blocks. Fixes compilation with
+ gcc 2.x and other compilers. Fixes bug #530611.
+
2008-04-29 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* gst/mpegtsparse/mpegtspacketizer.c:
diff --git a/gst/subenc/gstsrtenc.c b/gst/subenc/gstsrtenc.c
index c9923fd0..4077f765 100644
--- a/gst/subenc/gstsrtenc.c
+++ b/gst/subenc/gstsrtenc.c
@@ -63,16 +63,18 @@ GST_BOILERPLATE (GstSrtEnc, gst_srt_enc, GstElement, GST_TYPE_ELEMENT);
static gchar *
gst_srt_enc_timestamp_to_string (GstClockTime timestamp)
{
- guint h = timestamp / (3600 * GST_SECOND);
+ guint h, m, s, ms;
+
+ h = timestamp / (3600 * GST_SECOND);
timestamp -= h * 3600 * GST_SECOND;
- guint m = timestamp / (60 * GST_SECOND);
+ m = timestamp / (60 * GST_SECOND);
timestamp -= m * 60 * GST_SECOND;
- guint s = timestamp / GST_SECOND;
+ s = timestamp / GST_SECOND;
timestamp -= s * GST_SECOND;
- guint ms = timestamp / GST_MSECOND;
+ ms = timestamp / GST_MSECOND;
return g_strdup_printf ("%.2d:%.2d:%.2d,%.3d", h, m, s, ms);
}