And removed our patch that has been applied upstream.
Close #5795

Pointed by Mangled Deutz
(cherry picked from commit 0bce87068194ed1a06e6e81daa9dfca9c578a953)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>