Merge commit '1e791ee3aae63122afb10cbabe86a747aea58992'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:17:02 +0000 (18:17 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:17:02 +0000 (18:17 +0100)
commit0e29820cd16461414236068992d9d35fa0ca058f
treed74713813121d21874f2e8b55b6322755bd0cf9f
parentb3453f44edae9160439f8cd8580d151554c87e5f
parent1e791ee3aae63122afb10cbabe86a747aea58992
Merge commit '1e791ee3aae63122afb10cbabe86a747aea58992'

* commit '1e791ee3aae63122afb10cbabe86a747aea58992':
  segafilm: set video and audio stream duration

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