mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-01-06 14:15:29 +01:00
Merge commit 'ac1a1cb948fe29975424e367173b88db48792144'
* commit 'ac1a1cb948fe29975424e367173b88db48792144':
dashenc: replace attribute id with contentType for the AdaptationSet element
See: 32a4177a62
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: