[FFmpeg-cvslog] Merge commit 'ac1a1cb948fe29975424e367173b88db48792144'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 11 01:46:24 2015 +0200| [ae99f06e5a5f8010a0050bbb05636515d92064f9] | committer: Michael Niedermayer

Merge commit 'ac1a1cb948fe29975424e367173b88db48792144'

* commit 'ac1a1cb948fe29975424e367173b88db48792144':
  dashenc: replace attribute id with contentType for the AdaptationSet element

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

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