(cherry picked from commit d00fe8ac34d626a5e24d1c8b2e564b5364c62136)

ref #8265 and possibly ref #8183
Signed-off-by: Ilkka Ollakka <ileoo@videolan.org>