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 d571307dbd5ccf8c264fc38432431e4828aa63e9..3ffb2d2c3969f0125cd7ba130ccb6d9966e06012 100644 (file)
--- 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);\r
                nb_frames = muxer_->calc_nb_frames(nb_frames);\r
                \r
-               return nb_frames > start_ ? nb_frames - start_ : 0;\r
+               return nb_frames;\r
        }\r
 \r
        uint32_t file_nb_frames() const\r