Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6'
authorClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 14:50:37 +0000 (15:50 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 22 Mar 2017 14:50:37 +0000 (15:50 +0100)
commit97c17cafab4ecf6df70de4ce19ada325d5b585c3
treefacfa46c81f80634f0538304f8e5b86be4b05d20
parent17f2c0abea87df16edd2a6170a1d3ece23b2e465
parentd10102d23c9467d4eb84f58e0cd12be284b982f6
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>