We cannot (easily) move to a newer upstream version where this is fixed as ffmpeg moved to git / is no longer bundled, so instead this fix is backported (upstream r34498 + r34503). Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
