[vlc-commits] Revert "demux:mkv: make the Seekpoints immutable"

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jan 22 12:25:12 2018 +0100| [c4d7186c2447110c6b7e76e7f4fbf1a0435db37e] | committer: Steve Lhomme

Revert "demux:mkv: make the Seekpoints immutable"

Immutable objects used in containers does not work well.
See https://stackoverflow.com/questions/42283716/immutable-classes-and-copy-constructors

This reverts commit b17cd27d807953f741750cf994cc286fc1216602.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c4d7186c2447110c6b7e76e7f4fbf1a0435db37e
---

 modules/demux/mkv/matroska_segment_seeker.hpp | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment_seeker.hpp b/modules/demux/mkv/matroska_segment_seeker.hpp
index 6d5e088f6a..e2e1579354 100644
--- a/modules/demux/mkv/matroska_segment_seeker.hpp
+++ b/modules/demux/mkv/matroska_segment_seeker.hpp
@@ -69,23 +69,14 @@ class SegmentSeeker
                 : Seekpoint( std::numeric_limits<fptr_t>::max(), -1, DISABLED )
             { }
 
-            Seekpoint(const Seekpoint & sp)
-                : Seekpoint( sp.fpos, sp.pts, sp.trust_level )
-            { }
-
-            Seekpoint operator=( const Seekpoint & other ) const
-            {
-                return other;
-            }
-
             bool operator<( Seekpoint const& rhs ) const
             {
                 return pts < rhs.pts;
             }
 
-            const fptr_t fpos;
-            const mtime_t pts;
-            const TrustLevel trust_level;
+            fptr_t fpos;
+            mtime_t pts;
+            TrustLevel trust_level;
         };
 
         struct Cluster {