Merge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 22:23:25 +0000 (23:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 22:32:40 +0000 (23:32 +0100)
* commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff':
  mkv: Validate ASS Start and End fields

Conflicts:
libavformat/matroskaenc.c

No change as the changed code is not in FFmpeg

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

Trivial merge