Add ‘--prefer-avconv’ and ‘--prefer-ffmpeg’ options (#2115)

Affects the ffmpeg post processors, if ‘--prefer-ffmpeg’ is given and both avconv and ffmpeg are installed, it will use ffmpeg. Otherwise it will follow the old behaviour.
Merge remote-tracking branch 'origin/prefer-ffmpeg'