From 507a649ad0b3ff28b6340b25a335a855bca5ccdf Mon Sep 17 00:00:00 2001
From: wang-bin <wbsecg1@gmail.com>
Date: Wed, 4 Nov 2015 22:00:31 +0800
Subject: [PATCH] always set clock initial value #542

the force fps logic was changed recently. if sync to external clock and
media start time != 0, clock initial value was not correctly set
---
 src/AVClock.cpp  | 3 ++-
 src/AVPlayer.cpp | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/AVClock.cpp b/src/AVClock.cpp
index 2dfe26ff..0367b94a 100644
--- a/src/AVClock.cpp
+++ b/src/AVClock.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
     QtAV:  Media play library based on Qt and FFmpeg
-    Copyright (C) 2012-2013 Wang Bin <wbsecg1@gmail.com>
+    Copyright (C) 2012-2015 Wang Bin <wbsecg1@gmail.com>
 
 *   This file is part of QtAV
 
@@ -80,6 +80,7 @@ bool AVClock::isActive() const
 void AVClock::setInitialValue(double v)
 {
     value0 = v;
+    qDebug("Clock initial value: %f", v);
 }
 
 double AVClock::initialValue() const
diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
index ebbf0a77..a5ae0265 100644
--- a/src/AVPlayer.cpp
+++ b/src/AVPlayer.cpp
@@ -1221,9 +1221,8 @@ void AVPlayer::playInternal()
             qDebug("Using AudioClock");
             masterClock()->setClockType(AVClock::AudioClock);
         }
-        masterClock()->setInitialValue((double)absoluteMediaStartPosition()/1000.0);
-        qDebug("Clock initial value: %f", masterClock()->value());
     }
+    masterClock()->setInitialValue((double)absoluteMediaStartPosition()/1000.0);
     // from previous play()
     if (d->demuxer.audioCodecContext() && d->athread) {
         qDebug("Starting audio thread...");