[FFmpeg-cvslog] Merge commit '9455a023be9f3915ccf5511a0b8fdb5b8897b2b6' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 20 00:48:51 2014 +0200| [6af1793dd5a26b0617b31b0165f94d4bfc7c5160] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6af1793dd5a26b0617b31b0165f94d4bfc7c5160
---