[FFmpeg-cvslog] Merge commit 'ea1806ce650f0502dd25939c335b9216fa4a955f' into release/1.1
Michael Niedermayer
git at videolan.org
Mon Apr 21 16:08:50 CEST 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 16:00:51 2014 +0200| [8401ed651b2c6b089ebb6d5afbf05e662dfbf87e] | committer: Michael Niedermayer
Merge commit 'ea1806ce650f0502dd25939c335b9216fa4a955f' into release/1.1
* commit 'ea1806ce650f0502dd25939c335b9216fa4a955f':
sgidec: fix buffer size check in expand_rle_row()
Conflicts:
libavcodec/sgidec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8401ed651b2c6b089ebb6d5afbf05e662dfbf87e
---
More information about the ffmpeg-cvslog
mailing list