resolve merge conflict for MPEGDASH
Merge branch 'master' of https://github.com/c-alpha/specref