ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Wed Mar 11
20:09:18 2015 +0100| [e48ff13ba722f2ac37681eeea1b7813292ac87fa] | committer:
Michael Niedermayer
Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
matroskaenc: Fix type used for chapter timestamps
Conflicts:
libavformat/matroskaenc.c
See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e48ff13ba722f2ac37681eeea1b7813292ac87fa
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
