[FFmpeg-cvslog] Merge commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21' into release/2.2

Michael Niedermayer git at videolan.org
Mon Jul 14 22:35:48 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 14 22:23:26 2014 +0200| [d832020bd853f84b96a3fdf3e0a385d8492ec8c8] | committer: Michael Niedermayer

Merge commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21' into release/2.2

* commit '6d899d0206e91a3a74680b47ec06ef1dbc151c21':
  lzo: Handle integer overflow

Conflicts:
	libavutil/lzo.c

This is basically not merging changes due to this being fixed differently
in FFmpeg

See: d6af26c55c1ea30f85a7d9edbc373f53be1743ee
See: cf2b7c01f81c1fb3283a1390c0ca9a2f81f4f4a8

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

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





More information about the ffmpeg-cvslog mailing list