Suggested-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ab834b8f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>