mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-11 09:06:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "qtdemux: fix GstDateTime/GDateTime mixup"

Browse source 
This reverts commit 5326126112.

The GstDateTime->GDateTime change in core was apparently accidental,
and is now reverted.
This commit is contained in:
Vincent Penquerc'h 2012-01-26 18:26:02 +00:00
parent 714e556ef1
commit 4d73fe793a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/isomp4/qtdemux.c
View file

@ -8825,7 +8825,7 @@ qtdemux_parse_tree (GstQTDemux * qtdemux)
GNode *mvex;
gint64 duration;
guint64 creation_time;
GDateTime *datetime = NULL;
GstDateTime *datetime = NULL;
gint version;
mvhd = qtdemux_tree_get_child_by_type (qtdemux->moov_node, FOURCC_mvhd);
@ -8859,7 +8859,7 @@ qtdemux_parse_tree (GstQTDemux * qtdemux)
if (now.tv_sec + 24 * 3600 < creation_time) {
GST_DEBUG_OBJECT (qtdemux, "discarding bogus future creation time");
} else {
datetime = g_date_time_new_from_unix_local (creation_time);
datetime = gst_date_time_new_from_unix_epoch_local_time (creation_time);
}
} else {
GST_WARNING_OBJECT (qtdemux, "Can't handle datetimes before 1970 yet, "
@ -8873,7 +8873,7 @@ qtdemux_parse_tree (GstQTDemux * qtdemux)
/* Use KEEP as explicit tags should have a higher priority than mvhd tag */
gst_tag_list_add (qtdemux->tag_list, GST_TAG_MERGE_KEEP, GST_TAG_DATE_TIME,
datetime, NULL);
g_date_time_unref (datetime);
gst_date_time_unref (datetime);
}
GST_INFO_OBJECT (qtdemux, "timescale: %u", qtdemux->timescale);