[FFmpeg-cvslog] Merge commit '1e791ee3aae63122afb10cbabe86a747aea58992'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Nov 10 18:17:02 2015 +0100| [0e29820cd16461414236068992d9d35fa0ca058f] | committer: Hendrik Leppkes

Merge commit '1e791ee3aae63122afb10cbabe86a747aea58992'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e29820cd16461414236068992d9d35fa0ca058f
---