cherry picked from commit 211c39ade87bc079eabc862a6b684544dc88a786
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>