They applied it upstream, almost completly
As discussed at FOMS
(cherry picked from commit c03f74b690598a7fe51b1589b8dbeac07805ca0d)
Signed-off-by: Konstantin Pavlov <thresh@videolan.org>