From: Helge Norberg <helge.norberg@gmail.com>
Date: Mon, 20 Jan 2014 12:49:46 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/CasparCG/Server
X-Git-Tag: 2.0.7_Beta~5
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=82de59f04d8e297d7f027859110e312a947bcd17;hp=6ea15cd979f4cfc4a5382ff34e91033f1b266f39;p=casparcg

Merge branch 'master' of https://github.com/CasparCG/Server
---

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index d571307db..3ffb2d2c3 100644
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -365,7 +365,7 @@ public:
 		nb_frames = std::min(length_, nb_frames);
 		nb_frames = muxer_->calc_nb_frames(nb_frames);
 		
-		return nb_frames > start_ ? nb_frames - start_ : 0;
+		return nb_frames;
 	}
 
 	uint32_t file_nb_frames() const