2.0. Updated namespaces.

[casparcg] / modules / ffmpeg / producer / filter / parallel_yadif.cpp

diff --git a/modules/ffmpeg/producer/filter/parallel_yadif.cpp b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
index 97b31ef19d626027a0f9bd1c58dbe8bfb352aa27..0f2f04f1a0d202574c8fade9ac0e59d9228c7c6c 100644 (file)
--- a/modules/ffmpeg/producer/filter/parallel_yadif.cpp
+++ b/modules/ffmpeg/producer/filter/parallel_yadif.cpp
@@ -76,7 +76,7 @@ void parallel_yadif_filter_line(parallel_yadif_context& ctx, uint8_t *dst, uint8
        }\r
 }\r
 \r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
        \r
 tbb::concurrent_bounded_queue<decltype(org_yadif_filter_line)> parallel_line_func_pool;\r
 std::array<parallel_yadif_context, 18> ctxs;\r
@@ -125,8 +125,8 @@ std::shared_ptr<void> make_parallel_yadif(AVFilterContext* ctx)
                        ++index;\r
 \r
                ctxs[index].last_index = 0;\r
-               for (int y = 0; y < ctx->inputs[0]->h; y++)
-               {
+               for (int y = 0; y < ctx->inputs[0]->h; y++)\r
+               {\r
             if ((y ^ yadif->parity) & 1)\r
                                ++ctxs[index].last_index;\r
                }\r
@@ -137,4 +137,4 @@ std::shared_ptr<void> make_parallel_yadif(AVFilterContext* ctx)
        return std::shared_ptr<void>(func, return_parallel_yadif);\r
 }\r
 \r
-}
\ No newline at end of file
+}}
\ No newline at end of file