[FFmpeg-cvslog] Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 20:25:47 2015 +0100| [d302853bcabf47c53c47abb4714d5bc7c01f0b0b] | committer: Michael Niedermayer

Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'

* commit '5dc47a2bd52e375ed742c45d08356b45098f458d':
  matroskaenc: Validate chapter start and end times

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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