Merge commit '72839fce6457fdb5d51b4a5381ac52914ee66389'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:22:41 +0000 (09:22 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:22:41 +0000 (09:22 +0200)
commit316825f3e9d5f27ed31650928daba3f18bf06600
tree301229219794cd25b94e1bc877bea506b7bdb40e
parent983fa5a1a922b5436befd26cc1b301a35c5765d8
parent72839fce6457fdb5d51b4a5381ac52914ee66389
Merge commit '72839fce6457fdb5d51b4a5381ac52914ee66389'

* commit '72839fce6457fdb5d51b4a5381ac52914ee66389':
  hlsenc: Use AV_TIME_BASE units for all the computations

Not merged, duration/time computation is handled quite differently in ffmpeg's hlsenc

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>