Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6'

* commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6':
  avconv: set the encoding framerate when the output is CFR

This commit is a noop, see 8db301deadfcf113fb274881e65afcbe3e1bd645

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-22 15:50:37 +01:00
commit 97c17cafab

Diff Content Not Available