mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 00:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: fix GstDateTime/GDateTime mixup

Browse source
This commit is contained in:
Vincent Penquerc'h 2012-01-26 17:47:29 +00:00
parent 33ae3fe047
commit 5326126112
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; GNode *mvex;
gint64 duration; gint64 duration;
guint64 creation_time; guint64 creation_time;
GstDateTime *datetime = NULL; GDateTime *datetime = NULL;
gint version; gint version;
mvhd = qtdemux_tree_get_child_by_type (qtdemux->moov_node, FOURCC_mvhd); 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) { if (now.tv_sec + 24 * 3600 < creation_time) {
GST_DEBUG_OBJECT (qtdemux, "discarding bogus future creation time"); GST_DEBUG_OBJECT (qtdemux, "discarding bogus future creation time");
} else { } else {
datetime = gst_date_time_new_from_unix_epoch_local_time (creation_time); datetime = g_date_time_new_from_unix_local (creation_time);
} }
} else { } else {
GST_WARNING_OBJECT (qtdemux, "Can't handle datetimes before 1970 yet, " 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 */ /* 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, gst_tag_list_add (qtdemux->tag_list, GST_TAG_MERGE_KEEP, GST_TAG_DATE_TIME,
datetime, NULL); datetime, NULL);
gst_date_time_unref (datetime); g_date_time_unref (datetime);
} }
GST_INFO_OBJECT (qtdemux, "timescale: %u", qtdemux->timescale); GST_INFO_OBJECT (qtdemux, "timescale: %u", qtdemux->timescale);