Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 19:44:25 +0000 (21:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 19:44:25 +0000 (21:44 +0200)
commit8e7c8325d202d7cd59cfab4172760a3a5c3799ed
tree9d879fda5a5ffd0b8fb31246538ecec37e562761
parent4b13ec69c6a23dd25d048bb129fadba131849cf9
parent3f3232a371cc88696184d9aef1f812656264e56c
Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c