From c43dfb815a4951b8248f4f0e98babe4f80204f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 3 Apr 2015 13:14:53 +0200 Subject: Imported Upstream version 0.22.0 --- src/VideoSupport.vala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/VideoSupport.vala') diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala index e23ba37..4e6f3ed 100644 --- a/src/VideoSupport.vala +++ b/src/VideoSupport.vala @@ -1,4 +1,4 @@ -/* Copyright 2010-2014 Yorba Foundation +/* Copyright 2010-2015 Yorba Foundation * * This software is licensed under the GNU LGPL (version 2.1 or later). * See the COPYING file in this distribution. @@ -197,8 +197,11 @@ public class VideoReader { // (and the corresponding output struct) in order to implement #2836. Date? video_date = null; if (info.get_tags() != null && info.get_tags().get_date(Gst.Tags.DATE, out video_date)) { - timestamp = new DateTime.local(video_date.get_year(), video_date.get_month(), - video_date.get_day(), 0, 0, 0); + // possible for get_date() to return true and a null Date + if (video_date != null) { + timestamp = new DateTime.local(video_date.get_year(), video_date.get_month(), + video_date.get_day(), 0, 0, 0); + } } } catch (Error e) { debug("Video read error: %s", e.message); -- cgit v1.2.3