[vlc-commits] demux: adaptive: remove vtable from representation selector

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Sep 20 21:13:30 2016 +0200| [f6fa779c861e7d094854bf355055cc916afd3d46] | committer: Francois Cartegnie

demux: adaptive: remove vtable from representation selector

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

 modules/demux/adaptive/logic/Representationselectors.cpp |  4 ++++
 modules/demux/adaptive/logic/Representationselectors.hpp | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/modules/demux/adaptive/logic/Representationselectors.cpp b/modules/demux/adaptive/logic/Representationselectors.cpp
index 298c346..1e6b36e 100644
--- a/modules/demux/adaptive/logic/Representationselectors.cpp
+++ b/modules/demux/adaptive/logic/Representationselectors.cpp
@@ -33,6 +33,10 @@ RepresentationSelector::RepresentationSelector()
 {
 }
 
+RepresentationSelector::~RepresentationSelector()
+{
+}
+
 BaseRepresentation * RepresentationSelector::select(BaseAdaptationSet *adaptSet) const
 {
     return select(adaptSet, std::numeric_limits<uint64_t>::max());
diff --git a/modules/demux/adaptive/logic/Representationselectors.hpp b/modules/demux/adaptive/logic/Representationselectors.hpp
index 83ba58e..b244b25 100644
--- a/modules/demux/adaptive/logic/Representationselectors.hpp
+++ b/modules/demux/adaptive/logic/Representationselectors.hpp
@@ -39,14 +39,14 @@ namespace adaptive
         {
         public:
             RepresentationSelector();
-            virtual ~RepresentationSelector() {}
-            virtual BaseRepresentation * select(BaseAdaptationSet *) const;
-            virtual BaseRepresentation * select(BaseAdaptationSet *, uint64_t bitrate) const;
-            virtual BaseRepresentation * select(BaseAdaptationSet *, uint64_t bitrate,
-                                            int width, int height) const;
+             ~RepresentationSelector();
+            BaseRepresentation * select(BaseAdaptationSet *) const;
+            BaseRepresentation * select(BaseAdaptationSet *, uint64_t bitrate) const;
+            BaseRepresentation * select(BaseAdaptationSet *, uint64_t bitrate,
+                                        int width, int height) const;
         protected:
-            virtual BaseRepresentation * select(std::vector<BaseRepresentation *>&reps,
-                                            uint64_t minbitrate, uint64_t maxbitrate) const;
+            BaseRepresentation * select(std::vector<BaseRepresentation *>&reps,
+                                        uint64_t minbitrate, uint64_t maxbitrate) const;
         };
 
     }