mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-20 08:41:07 +00:00
Revert "avidemux: fix GstDateTime/GDateTime mixup"
This reverts commit acc9f15096
.
The GstDateTime->GDateTime change in core was apparently accidental,
and is now reverted.
This commit is contained in:
parent
acc9f15096
commit
714e556ef1
1 changed files with 3 additions and 3 deletions
|
@ -3412,7 +3412,7 @@ gst_avi_demux_add_date_tag (GstAviDemux * avi, gint y, gint m, gint d,
|
||||||
gint h, gint min, gint s)
|
gint h, gint min, gint s)
|
||||||
{
|
{
|
||||||
GDate *date;
|
GDate *date;
|
||||||
GDateTime *dt;
|
GstDateTime *dt;
|
||||||
|
|
||||||
date = g_date_new_dmy (d, m, y);
|
date = g_date_new_dmy (d, m, y);
|
||||||
if (!g_date_valid (date)) {
|
if (!g_date_valid (date)) {
|
||||||
|
@ -3422,7 +3422,7 @@ gst_avi_demux_add_date_tag (GstAviDemux * avi, gint y, gint m, gint d,
|
||||||
return;
|
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)
|
if (avi->globaltags == NULL)
|
||||||
avi->globaltags = gst_tag_list_new_empty ();
|
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) {
|
if (dt) {
|
||||||
gst_tag_list_add (avi->globaltags, GST_TAG_MERGE_REPLACE, GST_TAG_DATE_TIME,
|
gst_tag_list_add (avi->globaltags, GST_TAG_MERGE_REPLACE, GST_TAG_DATE_TIME,
|
||||||
dt, NULL);
|
dt, NULL);
|
||||||
g_date_time_unref (dt);
|
gst_date_time_unref (dt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue