Merge commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b'
authorClément Bœsch <u@pkh.me>
Sat, 1 Apr 2017 10:09:50 +0000 (12:09 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 1 Apr 2017 10:09:50 +0000 (12:09 +0200)
commitfb1a2cbae10a518a99b47157792ffe44e5e80b56
tree0dd791959d3a8f82cff2b7f99b089c05518e0b61
parente83a1c5b7ce0d978d69e677bead6cdcf07ec7d38
parentbcefafa226dcda23d4d9af9601d19389cb918a5b
Merge commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b'

* commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b':
  avisynth: Fix setting stream timebase

This commit is a noop, see 8009a1f1fdce16a59ea911e2b768e56ec4c8e344

Merged-by: Clément Bœsch <u@pkh.me>