Remove old file.
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Hand-apply 6b18c618940cf698a069bb95c66f656499f3e4bf from master (remove default scale and use a scale guessed from the content's size and sample aspect ratio).