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