2.0. Updated namespaces.

[casparcg] / modules / ffmpeg / producer / util.cpp

diff --git a/modules/ffmpeg/producer/util.cpp b/modules/ffmpeg/producer/util.cpp
index 5dece9e34b377b4c64db23d491a53c6911b2b19e..79fae01a8cbb9bcae4b8ed949ff3fe1a8dae64dc 100644 (file)
--- a/modules/ffmpeg/producer/util.cpp
+++ b/modules/ffmpeg/producer/util.cpp
@@ -33,7 +33,7 @@ extern "C"
 #pragma warning (pop)\r
 #endif\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
 \r
 core::field_mode::type get_mode(AVFrame& frame)\r
 {\r
@@ -140,7 +140,7 @@ safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVF
        {\r
                auto pix_fmt = static_cast<PixelFormat>(decoded_frame->format);\r
 \r
-               auto write = frame_factory->create_frame(tag, desc.pix_fmt != core::pixel_format::invalid ? desc : get_pixel_format_desc(PIX_FMT_BGRA, width, height));\r
+               auto write = frame_factory->create_frame(tag, get_pixel_format_desc(PIX_FMT_BGRA, width, height));\r
                write->set_type(get_mode(*decoded_frame));\r
 \r
                std::shared_ptr<SwsContext> sws_context;\r
@@ -264,7 +264,7 @@ void fix_meta_data(AVFormatContext& context)
                        double fps_nb_frames    = static_cast<double>(duration_sec*fps);\r
                        double stream_nb_frames =  static_cast<double>(video_stream.nb_frames);\r
                        double diff = std::abs(fps_nb_frames - stream_nb_frames*2.0);\r
-                       if(diff < fps_nb_frames*0.01)\r
+                       if(diff < fps_nb_frames*0.05)\r
                                video_context.time_base.num *= 2;\r
                }\r
        }\r
@@ -287,4 +287,4 @@ void fix_meta_data(AVFormatContext& context)
        video_context.time_base.den = static_cast<int>(closest_fps*1000000.0);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file