From f1f2876e1e173e72b726f9a3b8c8aec4234aed2b Mon Sep 17 00:00:00 2001 From: ronag Date: Sat, 3 Sep 2011 14:05:34 +0000 Subject: [PATCH] git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1333 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- modules/ffmpeg/producer/ffmpeg_producer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(width_) + L"x" + boost::lexical_cast(height_) - + (is_progressive_ ? L"p" : L"i") + boost::lexical_cast(fps_) + + (is_progressive_ ? L"p" : L"i") + boost::lexical_cast(is_progressive_ ? fps_ : 2.0 * fps_) + L"]"; } }; -- 2.39.2