Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 045b80e52df7ba9c97084c946b4929000d5f5bc7)
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d08928bbea2b495596c2d3bc7df3cfb3e3b2b7e3)