[vlc-commits] demux: adaptive: inherit template defaults (fix #22047)

[Francois Cartegnie]

vlc/vlc-3.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Apr 15 18:20:14 2019 +0200| [faf87cac04c128cb7a511bfe174140feee81ef3f] | committer: Francois Cartegnie

demux: adaptive: inherit template defaults (fix #22047)

not the complete and efficient way.
we'll need a better inheritance fix at parsing level.

(cherry picked from commit 7ff23c447d942c4bd4f88bbcd680892d57643b9e)

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

 modules/demux/adaptive/playlist/Inheritables.hpp   |   4 +-
 .../demux/adaptive/playlist/SegmentInformation.cpp |  26 ++---
 .../demux/adaptive/playlist/SegmentInformation.hpp |   1 +
 .../demux/adaptive/playlist/SegmentTemplate.cpp    | 106 +++++++++++++++++----
 modules/demux/adaptive/playlist/SegmentTemplate.h  |  10 +-
 modules/demux/dash/mpd/IsoffMainParser.cpp         |  19 ++--
 modules/demux/dash/mpd/Representation.cpp          |   5 +-
 modules/demux/smooth/playlist/Parser.cpp           |   2 +-
 modules/demux/smooth/playlist/Representation.cpp   |   8 +-
 9 files changed, 132 insertions(+), 49 deletions(-)

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