From: <sl...@ke...> - 2008-04-29 19:12:08
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: slomo Date: Tue Apr 29 2008 19:12:11 UTC Log message: 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. Modified files: . : ChangeLog gst/subenc : gstsrtenc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3288&r2=1.3289 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/subenc/gstsrtenc.c.diff?r1=1.3&r2=1.4 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.3288 retrieving revision 1.3289 diff -u -d -r1.3288 -r1.3289 --- ChangeLog 29 Apr 2008 09:02:31 -0000 1.3288 +++ ChangeLog 29 Apr 2008 19:11:55 -0000 1.3289 @@ -1,3 +1,11 @@ +2008-04-29 Sebastian Dröge <sl...@ci...> + + 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: Index: gstsrtenc.c RCS file: /cvs/gstreamer/gst-plugins-bad/gst/subenc/gstsrtenc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- gstsrtenc.c 4 Apr 2008 20:43:18 -0000 1.3 +++ gstsrtenc.c 29 Apr 2008 19:11:56 -0000 1.4 @@ -63,16 +63,18 @@ 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); } |