From 714e556ef1b82533627a56eca865474831613dd0 Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Thu, 26 Jan 2012 18:25:21 +0000 Subject: [PATCH] Revert "avidemux: fix GstDateTime/GDateTime mixup" This reverts commit acc9f150968b25c5ae5a6940b34ad2d51b174fd2. The GstDateTime->GDateTime change in core was apparently accidental, and is now reverted. --- gst/avi/gstavidemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index 3f72f48..6e19e61 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -3412,7 +3412,7 @@ gst_avi_demux_add_date_tag (GstAviDemux * avi, gint y, gint m, gint d, gint h, gint min, gint s) { GDate *date; - GDateTime *dt; + GstDateTime *dt; date = g_date_new_dmy (d, m, y); if (!g_date_valid (date)) { @@ -3422,7 +3422,7 @@ gst_avi_demux_add_date_tag (GstAviDemux * avi, gint y, gint m, gint d, return; } - dt = g_date_time_new_local (y, m, d, h, min, s); + dt = gst_date_time_new_local_time (y, m, d, h, min, s); if (avi->globaltags == NULL) avi->globaltags = gst_tag_list_new_empty (); @@ -3433,7 +3433,7 @@ gst_avi_demux_add_date_tag (GstAviDemux * avi, gint y, gint m, gint d, if (dt) { gst_tag_list_add (avi->globaltags, GST_TAG_MERGE_REPLACE, GST_TAG_DATE_TIME, dt, NULL); - g_date_time_unref (dt); + gst_date_time_unref (dt); } } -- 2.7.4