1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00

Merge commit 'ac1a1cb948fe29975424e367173b88db48792144'

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

See: 32a4177a627ddce984a5a9ed7023d9a63dcbdf85
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-11 01:46:24 +02:00
commit ae99f06e5a

Diff Content Not Available