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