(cherry picked from commit c57d47dbe87f236784e975743ae1fe32e18fdcdc)
(cherry picked from commit 753a7d15e9d2dedf650789245dc7d0b5b1765c65)
(cherry picked from commit 1ef8da27660e7a46070a7b104b9b5b1f96daf5a7)
(cherry picked from commit 44676a0590c2b96d13ea5a700b5878166b6f432a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>