Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 13:38:30 +0000 (14:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 13:38:33 +0000 (14:38 +0100)
commitc8b99f8ad0589bf1bf5f107f44eb4b207bf6c431
treefacc9a941ddc8fde6351c67da3d41cf60f95553c
parent9f3a555b84ba5ddc948e0700719ea2f9796acbd5
parent87acd33c092ab9e7d73686627e9105d99c1e4928
Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928'

* commit '87acd33c092ab9e7d73686627e9105d99c1e4928':
  aviocat: Add support for specifying the input duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tools/aviocat.c