[FFmpeg-cvslog] Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'
Michael Niedermayer
git at videolan.org
Sun Apr 13 03:27:36 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 03:01:03 2014 +0200| [94cf83ff91b2380e487211a0444bcd4ac9b58b75] | committer: Michael Niedermayer
Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'
* commit '0a467a9b594dd67aa96bad687d05f8845b009f18':
tiffdec: use bytestream2 to simplify overread/overwrite protection
Conflicts:
libavcodec/tiff.c
See: 1ec83d9a9e472f485897ac92bad9631d551a8c5b
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94cf83ff91b2380e487211a0444bcd4ac9b58b75
---
More information about the ffmpeg-cvslog
mailing list