[vlc-commits] demux: adaptative: merge streamformats

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Nov 13 17:46:14 2015 +0100| [fe32c1c6bf445b946f7d7c8e3c0c4d4d17d013bc] | committer: Francois Cartegnie

demux: adaptative: merge streamformats

only handling them should differ. adds debugging

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

 modules/demux/Makefile.am                          |    5 +-
 modules/demux/adaptative/StreamFormat.cpp          |   20 +++++++
 modules/demux/adaptative/StreamFormat.hpp          |    9 +++
 modules/demux/adaptative/Streams.cpp               |    4 +-
 modules/demux/dash/DASHStream.cpp                  |    9 ++-
 modules/demux/dash/DASHStreamFormat.hpp            |   60 --------------------
 modules/demux/dash/mpd/AdaptationSet.cpp           |    4 +-
 .../dash/mpd/DASHCommonAttributesElements.cpp      |    2 +
 modules/demux/dash/mpd/MPD.cpp                     |   18 ++++++
 modules/demux/dash/mpd/MPD.h                       |    4 ++
 modules/demux/dash/mpd/Representation.cpp          |    5 +-
 modules/demux/hls/HLSStreamFormat.hpp              |   40 -------------
 modules/demux/hls/HLSStreams.cpp                   |    9 ++-
 modules/demux/hls/playlist/HLSSegment.cpp          |    1 -
 modules/demux/hls/playlist/Parser.cpp              |   13 ++---
 modules/demux/hls/playlist/Representation.cpp      |    3 +-
 modules/demux/hls/playlist/Representation.hpp      |    2 +-
 modules/demux/smooth/SmoothStream.cpp              |    3 +-
 modules/demux/smooth/SmoothStreamFormat.hpp        |   38 -------------
 modules/demux/smooth/playlist/Representation.cpp   |    3 +-
 20 files changed, 78 insertions(+), 174 deletions(-)

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