]> git.sesse.net Git - casparcg/commitdiff
2.0.2: ffmpeg/util: Fix files with wierd double frame-rate.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 24 Nov 2011 19:15:43 +0000 (19:15 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Thu, 24 Nov 2011 19:15:43 +0000 (19:15 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1651 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/ffmpeg/producer/util/util.cpp

index 66cafa4b35750b4a3b6b89806eb5d0693a298de9..2b8b1b60d4d0dbb98108ea62231104f5e9abc228 100644 (file)
@@ -294,6 +294,14 @@ void fix_meta_data(AVFormatContext& context)
                {                       \r
                        if(video_context.time_base.num == 1)\r
                                video_context.time_base.num = static_cast<int>(std::pow(10.0, static_cast<int>(std::log10(static_cast<float>(video_context.time_base.den)))-1));        \r
+                       \r
+                       if(!is_sane_fps(video_context.time_base))\r
+                       {\r
+                               auto tmp = video_context.time_base;\r
+                               tmp.den /= 2;\r
+                               if(is_sane_fps(tmp))\r
+                                       video_context.time_base = tmp;\r
+                       }\r
 \r
                        if(!is_sane_fps(video_context.time_base) && audio_index > -1)\r
                        {\r