Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a68a6a4fb19caecc91d5f7fe3ef4f83f6d3c4586) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 44ddfd47d671d2587903d94c8b565f68f45bd4bc)