Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 19:25:47 +0000 (20:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 19:25:47 +0000 (20:25 +0100)
commitd302853bcabf47c53c47abb4714d5bc7c01f0b0b
tree45b3c53101a641a8b1ece6995183090c71c2b1c7
parentd2668ae472690fe102b7c63fbddd716ebca25dd3
parent5dc47a2bd52e375ed742c45d08356b45098f458d
Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'

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

Conflicts:
libavformat/matroskaenc.c

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