[FFmpeg-cvslog] Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af'
Michael Niedermayer
git at videolan.org
Fri Sep 20 15:22:53 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 15:12:21 2013 +0200| [f657ca0d0b3be7b5b9015d86af241b9237709652] | committer: Michael Niedermayer
Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af'
* commit 'd8798276b65543d921adadf63cc7f5ba2d1604af':
r3d: Add more input value validation
Conflicts:
libavformat/r3d.c
See: 99b1b2b1c65969ee324d754ea47e04a0a3f685a8
See: df92ac18528bac4566fc4f5ba4d607c1265791ea
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f657ca0d0b3be7b5b9015d86af241b9237709652
---
More information about the ffmpeg-cvslog
mailing list