[FFmpeg-cvslog] Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947'
Michael Niedermayer
git at videolan.org
Mon Nov 4 22:18:24 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 4 22:02:02 2013 +0100| [aeaca3816c2677bfdb16cbc6bc55c259ed5028ff] | committer: Michael Niedermayer
Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947'
* commit '1c736bedd9891501960ebac0f7c05eb60225e947':
omadec: check GEOB sizes against buffer size
Conflicts:
libavformat/omadec.c
See: e74fa25cb9f29aee8a36df0c8e492f8bafdbe4a0
See: 91e72e35141f590c38985ad0ae3453a4e9e86b8a
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aeaca3816c2677bfdb16cbc6bc55c259ed5028ff
---
More information about the ffmpeg-cvslog
mailing list