* commit 'b0f36a00':
  avconv: stop using setpts for input framerate forced with -r
Merged-by: Clément Bœsch <u@pkh.me>