This close #3646
(cherry picked from commit 07990fcdad3e635f05d53ab35d89ebece45f7eb2)
Signed-off-by: Rémi Duraffort <ivoire@videolan.org>