From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Sat, 3 Sep 2011 14:05:34 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~24
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=f1f2876e1e173e72b726f9a3b8c8aec4234aed2b

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1333 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/modules/ffmpeg/producer/ffmpeg_producer.cpp b/modules/ffmpeg/producer/ffmpeg_producer.cpp
index d20cbaca4..8d0c81d25 100644
--- a/modules/ffmpeg/producer/ffmpeg_producer.cpp
+++ b/modules/ffmpeg/producer/ffmpeg_producer.cpp
@@ -197,7 +197,7 @@ public:
 	{
 		return L"ffmpeg[" + boost::filesystem::wpath(filename_).filename() + L"|" 
 						  + boost::lexical_cast<std::wstring>(width_) + L"x" + boost::lexical_cast<std::wstring>(height_)
-						  + (is_progressive_ ? L"p" : L"i")  + boost::lexical_cast<std::wstring>(fps_)
+						  + (is_progressive_ ? L"p" : L"i")  + boost::lexical_cast<std::wstring>(is_progressive_ ? fps_ : 2.0 * fps_)
 						  + L"]";
 	}
 };