[FFmpeg-cvslog] Merge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'
Michael Niedermayer
git at videolan.org
Fri Dec 5 23:39:23 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 5 23:23:25 2014 +0100| [95f719fb8f475523d29f93a7e321a6db9f837631] | committer: Michael Niedermayer
Merge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'
* 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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95f719fb8f475523d29f93a7e321a6db9f837631
---
More information about the ffmpeg-cvslog
mailing list