Merge branch 'hevc_resampler'
Merge remote-tracking branch 'origin/dash_fixes'
fix segment timeline
fix error report
restore audio tracks encryption