[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=188ad84

The following commit has been merged in the master branch:
commit 188ad84090c595ff5147fb8f5dda560ead6825e4
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Nov 19 22:22:38 2014 +0000

    Issue: 999 .  Fix divide by zero exception.
---
 src/quicktimevideo.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

-- 
exiv2 packaging