Merge commit 'c012c6f1a8b34828a7870dc1854422934f14b79a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:16:11 +0000 (18:16 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 17:16:11 +0000 (18:16 +0100)
commitb3453f44edae9160439f8cd8580d151554c87e5f
treed74713813121d21874f2e8b55b6322755bd0cf9f
parent43266457b4f96e5f8becedf71971e4bb149afca3
parentc012c6f1a8b34828a7870dc1854422934f14b79a
Merge commit 'c012c6f1a8b34828a7870dc1854422934f14b79a'

* commit 'c012c6f1a8b34828a7870dc1854422934f14b79a':
  segafilm: implement seeking

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/segafilm.c