Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b706ddba)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>