Merge dev

Gijs Peskensrequested to merge
development into master

Adds dynamic buffer scaling feature.

Merge request reports

VideoLAN code repository instance