[Libreoffice-commits] core.git: avmedia/source

Stephan Bergmann sbergman at redhat.com
Thu Jan 11 07:44:34 UTC 2018


 avmedia/source/vlc/vlcframegrabber.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9bd8b02504973b7c14e599943070e50e98933060
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 11 08:44:02 2018 +0100

    Fix template parameter ambiguity
    
    Change-Id: I52f0134b599ee950e5c9e47a6374e44415a800af

diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 51cf22e5c8dc..eedbeacf3574 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -81,7 +81,7 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString
             return ::uno::Reference< css::graphic::XGraphic >();
         }
 
-        mPlayer.setTime( std::max(fMediaTime, 0) * MSEC_IN_SEC );
+        mPlayer.setTime( std::max(fMediaTime, 0.0) * MSEC_IN_SEC );
         mPlayer.pause();
 
         condition.wait(std::chrono::seconds(2));


More information about the Libreoffice-commits mailing list