And drop all our patches :)

(cherry picked from commit 3b82206fccd3282cc11a51dd0fb1d8ba4e2a3a75)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>