Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 6eabb0d3ad42b91c1b4c298718c29961f7c1653a)