Based on 59074310 by Andreas Cadhalpun.
Fixes ticket #5259.
(cherry picked from commit 2aa21eec)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>