OK, this patch should take into account the recommendations.
Signed-off-by: Antoine Cellerier <dionoea@videolan.org>
(cherry picked from commit 9934897a)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>