Inspired by jetru's patches, thank you. This should fix #3451
(cherry picked from commit 0a15eecf)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>