[vlc-commits] stream_filter: dash: merge managers
Francois Cartegnie
git at videolan.org
Thu Dec 18 22:39:46 CET 2014
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Nov 18 23:10:24 2014 +0100| [077312c6187965eed1c99a2f9fdd7749507e2304] | committer: Francois Cartegnie
stream_filter: dash: merge managers
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=077312c6187965eed1c99a2f9fdd7749507e2304
---
modules/stream_filter/Makefile.am | 8 +---
modules/stream_filter/dash/DASHManager.cpp | 2 +-
modules/stream_filter/dash/DASHManager.h | 6 +--
.../adaptationlogic/AbstractAdaptationLogic.cpp | 2 +-
.../dash/adaptationlogic/AbstractAdaptationLogic.h | 6 +--
.../adaptationlogic/AdaptationLogicFactory.cpp | 2 +-
.../dash/adaptationlogic/AdaptationLogicFactory.h | 4 +-
.../adaptationlogic/AlwaysBestAdaptationLogic.cpp | 2 +-
.../adaptationlogic/AlwaysBestAdaptationLogic.h | 7 ++-
.../adaptationlogic/RateBasedAdaptationLogic.cpp | 2 +-
.../adaptationlogic/RateBasedAdaptationLogic.h | 7 ++-
modules/stream_filter/dash/mpd/BasicCMManager.cpp | 36 --------------
modules/stream_filter/dash/mpd/BasicCMManager.h | 49 -------------------
.../stream_filter/dash/mpd/IsoffMainManager.cpp | 40 ----------------
modules/stream_filter/dash/mpd/IsoffMainManager.h | 50 --------------------
.../dash/mpd/{IMPDManager.cpp => MPDManager.cpp} | 16 +++----
.../dash/mpd/{IMPDManager.h => MPDManager.hpp} | 14 +++---
.../stream_filter/dash/mpd/MPDManagerFactory.cpp | 5 +-
modules/stream_filter/dash/mpd/MPDManagerFactory.h | 6 +--
modules/stream_filter/dash/xml/DOMParser.h | 2 +-
20 files changed, 41 insertions(+), 225 deletions(-)
Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=077312c6187965eed1c99a2f9fdd7749507e2304
More information about the vlc-commits
mailing list