[FFmpeg-cvslog] Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'
Michael Niedermayer
git at videolan.org
Sat Nov 2 09:45:48 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 2 09:39:51 2013 +0100| [525289ed261fb54366fc0983cbb13af0a0e3d8ca] | committer: Michael Niedermayer
Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1'
* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
flashsv: Check diff_start diff_height values
Conflicts:
libavcodec/flashsv.c
See: 880c73cd76109697447fbfbaa8e5ee5683309446
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=525289ed261fb54366fc0983cbb13af0a0e3d8ca
---
More information about the ffmpeg-cvslog
mailing list