based on patch by Richard Grenville <pyxlcy@gmail.com>
(cherry picked from commit 66da497b)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>