(cherry picked from commit 27e2bbffe7168ee928cbb37ebf8f196ca4a1e475)
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>