[FFmpeg-cvslog] Merge commit 'd6d78518018a12fb495baab5663708a830f3aab6'
Michael Niedermayer
git at videolan.org
Tue Feb 11 23:03:47 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 11 22:37:35 2014 +0100| [852dcf336bc553c906135bfa3dca559b5cf5c26f] | committer: Michael Niedermayer
Merge commit 'd6d78518018a12fb495baab5663708a830f3aab6'
* commit 'd6d78518018a12fb495baab5663708a830f3aab6':
g2meet: factor out seeking to the chunk end
Conflicts:
libavcodec/g2meet.c
See: 3f826039ddccdd7840cdf982a1a61cb11121a5a9
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=852dcf336bc553c906135bfa3dca559b5cf5c26f
---
More information about the ffmpeg-cvslog
mailing list