Missed this hunk in first commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 80a851aa)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>