projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4326645 c012c6f)
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)
* commit 'c012c6f1a8b34828a7870dc1854422934f14b79a':
  segafilm: implement seeking

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/segafilm.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/segafilm.c
Simple merge
FFmpeg git repo