[FFmpeg-cvslog] Merge commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b'
Michael Niedermayer
git at videolan.org
Sat Oct 25 04:43:31 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 04:37:27 2014 +0200| [3ae818f6ab04f14838ee073e685d73519725f6d1] | committer: Michael Niedermayer
Merge commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b'
* commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b':
matroskadec: check return values
Conflicts:
libavformat/matroskadec.c
See: 1116491c53156dd1972eca3e65d5a3b8529c4658
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ae818f6ab04f14838ee073e685d73519725f6d1
---
More information about the ffmpeg-cvslog
mailing list