2.1.0: draw_frame: Fixed bug with draw_frame::interlace where equal frames with unequ...

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2445 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/frame/draw_frame.cpp b/core/frame/draw_frame.cpp
index e4861ff8d11d8ce87f645e72bf22ef9fd343b6c7..562024911535fa871bf522eb997a212be31bf6ce 100644 (file)
--- a/core/frame/draw_frame.cpp
+++ b/core/frame/draw_frame.cpp
@@ -33,11 +33,10 @@ namespace caspar { namespace core {
                \r
 struct draw_frame::impl\r
 {              \r
-       int                                                                     tag_;\r
-       std::vector<draw_frame>                         frames_;\r
+       int                                                             tag_;\r
        std::shared_ptr<mutable_frame>  frame_;\r
-\r
-       core::frame_transform                           frame_transform_;               \r
+       std::vector<draw_frame>                 frames_;\r
+       core::frame_transform                   frame_transform_;               \r
 public:                \r
        enum tags\r
        {\r
@@ -89,9 +88,10 @@ public:
                \r
        bool operator==(const impl& other)\r
        {\r
-               return  tag_ == other.tag_ && \r
-                               frames_ == other.frames_ && \r
-                               frame_ == other.frame_;\r
+               return  tag_                            == other.tag_ && \r
+                               frames_                         == other.frames_ && \r
+                               frame_                          == other.frame_ &&\r
+                               frame_transform_        == other.frame_transform_;\r
        }\r
 };\r
        \r

diff --git a/shell/casparcg.config b/shell/casparcg.config
index 8f9cfed8567465b62b1edfeeb1666bd1a1aebc9c..2a14bf41e929a397daf0c61a8a7dedaeabbee051 100644 (file)
--- a/shell/casparcg.config
+++ b/shell/casparcg.config
@@ -13,9 +13,10 @@
   </flash>\r
   <channels>\r
     <channel>\r
-      <video-mode>720p5000</video-mode>\r
+      <video-mode>PAL</video-mode>\r
       <consumers>\r
         <screen>\r
+          <auto-deinterlace>false</auto-deinterlace>\r
         </screen>\r
       </consumers>\r
     </channel>\r