git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@2392...

diff --git a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
index 37d290a66abd6a7bac67ac6c51930e6389d63021..8a4662fa18104c0ed4cf1f41e7632bcc2b123b0a 100644 (file)
--- a/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
+++ b/modules/ffmpeg/consumer/ffmpeg_consumer.cpp
@@ -291,12 +291,10 @@ public:
                        c->bit_rate     = format_desc_.width < 1280 ? 50*1000000 : 100*1000000;\r
                        c->width = format_desc_.height == 1280 ? 960  : c->width;\r
                        \r
-                       //if(format_desc_.format == core::video_format::ntsc)\r
-                       //      c->pix_fmt = PIX_FMT_YUV411P;\r
-                       //else if(format_desc_.format == core::video_format::pal)\r
-                       //      c->pix_fmt = PIX_FMT_YUV420P;\r
-\r
-                       c->pix_fmt = PIX_FMT_YUV411P;\r
+                       if(format_desc_.format == core::video_format::ntsc)\r
+                               c->pix_fmt = PIX_FMT_YUV411P;\r
+                       else if(format_desc_.format == core::video_format::pal)\r
+                               c->pix_fmt = PIX_FMT_YUV420P;\r
 \r
                        if(c->bit_rate >= 50*1000000) // dv50\r
                                c->pix_fmt = PIX_FMT_YUV422P;\r