[0.11] gst-plugins-good: avidemux: fix GstDateTime/GDateTime mixup

Vincent Penquerc'h vincent at kemper.freedesktop.org
Thu Jan 26 09:54:26 PST 2012


Module: gst-plugins-good
Branch: 0.11
Commit: acc9f150968b25c5ae5a6940b34ad2d51b174fd2
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=acc9f150968b25c5ae5a6940b34ad2d51b174fd2

Author: Vincent Penquerc'h <vincent.penquerch at collabora.co.uk>
Date:   Thu Jan 26 17:50:30 2012 +0000

avidemux: fix GstDateTime/GDateTime mixup

This is a blind fix to match the one I just made to qtdemux,
as I do not have an AVI file where the code gets executed.

---

 gst/avi/gstavidemux.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 6e19e61..3f72f48 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;
-  GstDateTime *dt;
+  GDateTime *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 = gst_date_time_new_local_time (y, m, d, h, min, s);
+  dt = g_date_time_new_local (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);
-    gst_date_time_unref (dt);
+    g_date_time_unref (dt);
   }
 }
 



More information about the gstreamer-commits mailing list