(cherry picked from commit 3197968bedf9f0d6d3cccf11cfbd19c23063493b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 929822111bc10fdf19ca66b7ed09e0ebf802878b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>