(cherry picked from commit a1ad237835102a5468facf62c3e6c5584bb4f933)
Signed-off-by: Jean-Philippe André <jpeg@videolan.org>