mirror of https://github.com/FFmpeg/FFmpeg.git
* commit 'ac1a1cb948fe29975424e367173b88db48792144':
dashenc: replace attribute id with contentType for the AdaptationSet element
See: 32a4177a62
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/135/merge
commit
ae99f06e5a