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)
* commit '87acd33c092ab9e7d73686627e9105d99c1e4928':
  aviocat: Add support for specifying the input duration

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

diff --cc tools/aviocat.c
Simple merge