[FFmpeg-cvslog] Merge commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d'
Michael Niedermayer
git at videolan.org
Mon Jul 29 11:31:58 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 11:20:57 2013 +0200| [03853b1091e4a60c772677aa885e3d7e0ff19a12] | committer: Michael Niedermayer
Merge commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d'
* commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d':
xl: Fix the buffer size check
Conflicts:
libavcodec/xl.c
See: 8c59e0c362b948a746392b65932dd1cfeab8076c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03853b1091e4a60c772677aa885e3d7e0ff19a12
---
More information about the ffmpeg-cvslog
mailing list