[vlc-commits] adaptative: merge both modules

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jul 23 14:06:48 2015 +0200| [b93dcabcd38116c5348b68859270cae26ad58903] | committer: Francois Cartegnie

adaptative: merge both modules

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

 modules/MODULES_LIST                               |    3 +-
 modules/demux/Makefile.am                          |   40 ++---
 .../{hls/hls.cpp => adaptative/adaptative.cpp}     |  110 +++++++++-----
 modules/demux/dash/DASHManager.cpp                 |    6 +-
 modules/demux/dash/dash.cpp                        |  160 --------------------
 modules/demux/hls/HLSManager.cpp                   |    6 +-
 modules/demux/hls/playlist/Parser.cpp              |    4 +-
 po/POTFILES.in                                     |    3 +-
 8 files changed, 99 insertions(+), 233 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=b93dcabcd38116c5348b68859270cae26ad58903