git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/video_format.cpp b/core/video_format.cpp
index 43a2275feb5f5b18feed04e584e876f1d93dea67..ec0c5a099092e5465a49e9ec64a79801af2b4662 100644 (file)
--- a/core/video_format.cpp
+++ b/core/video_format.cpp
@@ -97,27 +97,6 @@ video_format_desc::video_format_desc(const std::wstring& name)
        }\r
 }\r
 \r
-video_format_desc& video_format_desc::operator=(const video_format_desc& other)\r
-{\r
-       format                          = other.format;                 \r
-       width                           = other.width;\r
-       height                          = other.height;\r
-       square_width            = other.square_width;\r
-       square_height           = other.square_height;\r
-       field_mode                      = other.field_mode;\r
-       fps                                     = other.fps;\r
-       time_scale                      = other.time_scale;\r
-       duration                        = other.duration;\r
-       field_count                     = other.field_count;\r
-       size                            = other.size;\r
-       name                            = other.name;\r
-       audio_sample_rate       = other.audio_sample_rate;\r
-       audio_channels          = other.audio_channels;\r
-       audio_cadence           = other.audio_cadence;\r
-\r
-       return *this;\r
-}\r
-\r
 bool operator==(const video_format_desc& lhs, const video_format_desc& rhs)\r
 {                                                                                      \r
        return lhs.format == rhs.format;\r

diff --git a/core/video_format.h b/core/video_format.h
index 62cd6932e39758d868f347e013d10449c0715e6b..0d4ac0018102325adc3d0bf4d695083e07b68d3c 100644 (file)
--- a/core/video_format.h
+++ b/core/video_format.h
@@ -90,9 +90,7 @@ struct video_format_desc sealed
                                          int duration,\r
                                          const std::wstring& name,\r
                                          const std::vector<int>& audio_cadence);\r
-\r
-       video_format_desc& operator=(const video_format_desc& other);\r
-       \r
+               \r
        video_format_desc(video_format format = video_format::invalid);\r
        video_format_desc(const std::wstring& name);\r
 };\r