[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=9a02b24

The following commit has been merged in the master branch:
commit 9a02b24a80bc4a8624643740ab76b43af03966e8
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Jan 8 12:35:59 2015 +0000

    #1022.  Thank You Mathieu for reporting this and providing the patch.
---
 src/quicktimevideo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/quicktimevideo.cpp b/src/quicktimevideo.cpp
index 73cd177..1bde4d7 100644
--- a/src/quicktimevideo.cpp
+++ b/src/quicktimevideo.cpp
@@ -1515,9 +1515,9 @@ namespace Exiv2 {
                 break;
             case TrackDuration:
                 if(currentStream_ == Video)
-                    xmpData_["Xmp.video.TrackDuration"] = returnBufValue(buf)/timeScale_;
+                    xmpData_["Xmp.video.TrackDuration"] = timeScale_ ? returnBufValue(buf)/timeScale_ : 0;
                 else if(currentStream_ == Audio)
-                    xmpData_["Xmp.audio.TrackDuration"] = returnBufValue(buf)/timeScale_;
+                    xmpData_["Xmp.audio.TrackDuration"] = timeScale_ ? returnBufValue(buf)/timeScale_ : 0;
                 break;
             case TrackLayer:
                 if(currentStream_ == Video)

-- 
exiv2 packaging