Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 19:09:18 +0000 (20:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 19:09:18 +0000 (20:09 +0100)
commite48ff13ba722f2ac37681eeea1b7813292ac87fa
tree00cd86bb670def668cbeab81121f061d69f8945c
parentf3a35e9d599fc2c2cf3c253b5f34917a2e9669dd
parent9272c965d9559a90ee64d46aebd99c117e07f7a3
Merge commit '9272c965d9559a90ee64d46aebd99c117e07f7a3'

* commit '9272c965d9559a90ee64d46aebd99c117e07f7a3':
  matroskaenc: Fix type used for chapter timestamps

Conflicts:
libavformat/matroskaenc.c

See: a4cd057bc7ddd2dd094d2ae7b0d6843ade95a626
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskaenc.c