[FFmpeg-cvslog] Merge commit 'c012c6f1a8b34828a7870dc1854422934f14b79a'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Nov 10 18:16:11 2015 +0100| [b3453f44edae9160439f8cd8580d151554c87e5f] | committer: Hendrik Leppkes

Merge commit 'c012c6f1a8b34828a7870dc1854422934f14b79a'

* commit 'c012c6f1a8b34828a7870dc1854422934f14b79a':
  segafilm: implement seeking

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

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