regression since 354b26a3

(cherry picked from commit 8c2c9740)
(cherry picked from commit c1e172c2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>