[FFmpeg-cvslog] Merge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'

Michael Niedermayer git at videolan.org
Mon Jan 6 14:48:05 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 14:40:26 2014 +0100| [e86cd37a7026d277e81413cbdde06556742791bb] | committer: Michael Niedermayer

Merge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'

* commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b':
  sgidec: fix buffer size check in expand_rle_row()

Conflicts:
	libavcodec/sgidec.c

See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e86cd37a7026d277e81413cbdde06556742791bb
---





More information about the ffmpeg-cvslog mailing list