Merge commit '9455a023be9f3915ccf5511a0b8fdb5b8897b2b6' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 22:48:51 +0000 (00:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 22:48:51 +0000 (00:48 +0200)
commit6af1793dd5a26b0617b31b0165f94d4bfc7c5160
tree29219f7b787dff7ce0709feade754f12ab6f6135
parent03bda44689914b68f0ebc6e39d6a30f5591b3781
parent9455a023be9f3915ccf5511a0b8fdb5b8897b2b6
Merge commit '9455a023be9f3915ccf5511a0b8fdb5b8897b2b6' into release/1.1

* commit '9455a023be9f3915ccf5511a0b8fdb5b8897b2b6':
  matroskaenc: do not write negative timestamps

Conflicts:
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

No change to fate as ffmpeg was not affected by these bugs

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