[FFmpeg-cvslog] Merge commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1' into release/2.4
Michael Niedermayer
git at videolan.org
Sat Dec 20 12:30:56 CET 2014
ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 20 12:20:28 2014 +0100| [b86c2640f65444981718d74dedb85a249d66435c] | committer: Michael Niedermayer
Merge commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1' into release/2.4
* commit '58dc526ebf722d33bf09275c1241674e0e6b9ef1':
smc: fix the bounds check
Conflicts:
libavcodec/smc.c
See: c727401aa9d62335e89d118a5b4e202edf39d905
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b86c2640f65444981718d74dedb85a249d66435c
---
More information about the ffmpeg-cvslog
mailing list