(cherry picked from commit 8893fbdf7a5b941ce353fd560817ae6a2c34cfff) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>