adaptative: merge both modules
authorFrancois Cartegnie <fcvlcdev@free.fr>
Thu, 23 Jul 2015 12:06:48 +0000 (14:06 +0200)
committerFrancois Cartegnie <fcvlcdev@free.fr>
Fri, 24 Jul 2015 13:08:05 +0000 (15:08 +0200)
commitb93dcabcd38116c5348b68859270cae26ad58903
treebbba24cc443cb10d8577cffa3249764e649928b5
parent58a0a84700327e66ee4669109a3189f960272d0d
adaptative: merge both modules
modules/MODULES_LIST
modules/demux/Makefile.am
modules/demux/adaptative/adaptative.cpp [new file with mode: 0644]
modules/demux/dash/DASHManager.cpp
modules/demux/dash/dash.cpp [deleted file]
modules/demux/hls/HLSManager.cpp
modules/demux/hls/hls.cpp [deleted file]
modules/demux/hls/playlist/Parser.cpp
po/POTFILES.in