Merge commit 'ac1a1cb948fe29975424e367173b88db48792144'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 23:46:24 +0000 (01:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 May 2015 23:46:32 +0000 (01:46 +0200)
* commit 'ac1a1cb948fe29975424e367173b88db48792144':
  dashenc: replace attribute id with contentType for the AdaptationSet element

See: 32a4177a627ddce984a5a9ed7023d9a63dcbdf85
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge